!25 riscv: openmp18添加漏打包的文件

From: @laokz 
Reviewed-by: @cf-zhao 
Signed-off-by: @cf-zhao

README.en.md

@@ -1,8 +1,23 @@
-# openmp
+# openmp-latest
 
 #### Description
 LLVM OpenMP Libraries
 
+#### Software Architecture
+Software architecture description
+
+#### Installation
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### Instructions
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
 #### Contribution
 
 1.  Fork the repository
@@ -10,6 +25,7 @@ LLVM OpenMP Libraries
 3.  Commit your code
 4.  Create Pull Request
 
+
 #### Gitee Feature
 
 1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md

README.md

@@ -1,8 +1,24 @@
-# openmp
+# openmp-latest
 
 #### 介绍
 LLVM OpenMP Libraries
 
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 使用说明
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
 #### 参与贡献
 
 1.  Fork 本仓库
@@ -10,6 +26,7 @@ LLVM OpenMP Libraries
 3.  提交代码
 4.  新建 Pull Request
 
+
 #### 特技
 
 1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md

openmp.spec

@@ -1,28 +1,20 @@
-%bcond_without sys_llvm
 %bcond_with check
 %bcond_without toolchain_clang
 
-%if %{with toolchain_clang}
-%global toolchain clang
-%endif
-
 %global toolchain clang
 
-%global maj_ver 17
+%global maj_ver 18
-%global min_ver 0
+%global min_ver 1
-%global patch_ver 6
+%global patch_ver 8
 %global openmp_version %{maj_ver}.%{min_ver}.%{patch_ver}
 %global openmp_srcdir openmp-%{openmp_version}.src
 
-%if %{with sys_llvm}
+%global _scl_prefix /opt/openEuler
-%global pkg_name libomp
+%{?scl:%scl_package %scl}
-%global install_prefix %{_prefix}
+%{!?scl:%global scl_prefix llvm-toolset-%{maj_ver}-}
-%global install_datadir %{_datadir}
+%{!?scl:%global pkg_name %{name}}
-%else
+%global install_prefix %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_prefix}
-%global pkg_name libomp%{maj_ver}
+%global install_datadir %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_datadir}
-%global install_prefix %{_libdir}/llvm%{maj_ver}
-%global install_datadir %{install_prefix}/share
-%endif
 
 %global install_includedir %{install_prefix}/include
 %global install_libdir %{install_prefix}/%{_lib}
@@ -35,7 +27,7 @@
 %global libomp_arch %{_arch}
 %endif
 
-Name:    %{pkg_name}
+Name:    %{?scl_prefix}openmp
 Version: %{openmp_version}
 Release: 2
 Summary: OpenMP runtime for clang
@@ -54,32 +46,23 @@ BuildRequires: perl-Encode
 BuildRequires: libffi-devel
 %if "%toolchain" == "clang"
 BuildRequires: clang
-BuildRequires: clang-tools-extra
 %endif
+BuildRequires: %{?scl_prefix}clang
+BuildRequires: %{?scl_prefix}clang-tools-extra
 
-%if %{with sys_llvm}
+BuildRequires: %{?scl_prefix}llvm-devel %{?scl_prefix}llvm-test
-BuildRequires: llvm-devel llvm-test
+BuildRequires: %{?scl_prefix}llvm-cmake-utils = %{version}
-BuildRequires: llvm-cmake-utils = %{version}
-%else
-BuildRequires: llvm%{maj_ver}-devel
-BuildRequires: llvm%{maj_ver}-test
-BuildRequires: llvm%{maj_ver}-cmake-utils = %{version}
-%endif
 
 Requires: elfutils-libelf%{?isa}
 
 %description
 OpenMP runtime for clang.
- 
+
 %package devel
 Summary: OpenMP header files
-Requires: %{name}%{?isa} = %{version}-%{release}
+Requires: %{pkg_name}%{?isa} = %{version}-%{release}
-%if %{with sys_llvm}
+Requires: %{?scl_prefix}clang-resource-filesystem%{?isa} = %{version}
-Requires: clang-resource-filesystem%{?isa} = %{version}
+
-%else
-Requires: clang%{maj_ver}-resource-filesystem%{?isa} = %{version}
-%endif
- 
 %description devel
 OpenMP header files.
 
@@ -87,7 +70,7 @@ OpenMP header files.
 %autosetup -n %{openmp_srcdir} -p2
 
 %build
- 
+
 %cmake	-GNinja \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
@@ -106,7 +89,7 @@ OpenMP header files.
 	-DCMAKE_SKIP_RPATH:BOOL=ON
 
 %ninja_build
- 
+
 %install
 %ninja_install
 rm -rf %{buildroot}%{install_libdir}/libarcher_static.a
@@ -121,21 +104,26 @@ rm -rf %{buildroot}%{install_libdir}/libarcher_static.a
 %{install_libdir}/libarcher.so
 %endif
 %ifnarch %{ix86} %{arm} riscv64
-%{install_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
+# libomptarget is not supported on 32-bit systems.
-%{install_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}
+%{install_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}.%{min_ver}
-%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}
+%{install_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}.%{min_ver}
+%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}.%{min_ver}
 %endif
-%{install_libdir}/libomptarget.so.%{maj_ver}
+%ifnarch %{ix86} %{arm}
- 
+%{install_libdir}/libomptarget.so.%{maj_ver}.%{min_ver}
+%endif
+
 %files devel
 %{install_libdir}/clang/%{maj_ver}/include/omp.h
-%{install_libdir}/cmake/openmp/FindOpenMPTarget.cmake
+%{install_libdir}/clang/%{maj_ver}/include/ompx.h
+%{install_libdir}/cmake/openmp/
 %ifnarch %{arm}
 %{install_libdir}/clang/%{maj_ver}/include/omp-tools.h
 %{install_libdir}/clang/%{maj_ver}/include/ompt.h
 %{install_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h
 %endif
 %ifnarch %{ix86} %{arm}
+# libomptarget is not supported on 32-bit systems.
 %ifnarch riscv64
 %{install_libdir}/libomptarget.rtl.amdgpu.so
 %{install_libdir}/libomptarget.rtl.cuda.so
@@ -144,13 +132,28 @@ rm -rf %{buildroot}%{install_libdir}/libarcher_static.a
 %{install_libdir}/libomptarget.devicertl.a
 %{install_libdir}/libomptarget-amdgpu-*.bc
 %{install_libdir}/libomptarget-nvptx-*.bc
-%endif
 %{install_libdir}/libomptarget.so
- 
+%endif
+
 %changelog
-* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-2
+* Tue Dec 31 2024 laokz <zhangkai@iscas.ac.cn> - 18.1.8-2
+- riscv64: fix unpackaged libomptarget.so.18
+
+* Fri Dec 6 2024 liyunfei <liyunfei33@huawei.com> - 18.1.8-1
+- init for Multi-Version LLVM-18.1.8
+
+* Sun Nov 10 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-5
+- adopt to new cmake macro
+
+* Tue Aug 20 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-4
+- Add BiSheng Autotuner support.
+
+* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-3
 - Add toolchain_clang build support
 
+* Wed Jun 05 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 17.0.6-2
+- fix build error for loongarch64
+
 * Mon Dec 4 2023 zhoujing <zhoujing106@huawei.com> - 17.0.6-1
 - Update to 17.0.6
 

openmp.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: llvm/llvm-project
+tag_prefix: ^llvmorg-
+separator: .