Add support for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

libomp.spec

@@ -5,19 +5,22 @@
 %{llvm_sb}
 %endif
 
-%global maj_ver 17
-%global libomp_version %{maj_ver}.0.6
+%global maj_ver 18
+%global min_ver 1
+%global libomp_version %{maj_ver}.%{min_ver}.1
 #global rc_ver 4
 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
-%global so_suffix %{maj_ver}
+%global so_suffix %{maj_ver}.%{min_ver}
 
 %if %{with snapshot_build}
 %undefine rc_ver
 %global maj_ver %{llvm_snapshot_version_major}
 %global libomp_version %{llvm_snapshot_version}
-%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
+%global so_suffix %{maj_ver}.%{min_ver}%{llvm_snapshot_version_suffix}
 %endif
 
+%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
+
 %global toolchain clang
 
 # Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
@@ -32,7 +35,7 @@
 
 Name: libomp
 Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 Summary: OpenMP runtime for clang
 
 License: Apache-2.0 WITH LLVM-exception OR NCSA
@@ -66,9 +69,6 @@ BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
-# libomp does not support s390x.
-ExcludeArch: s390x
-
 %description
 OpenMP runtime for clang.
 
@@ -123,14 +123,18 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 %ifnarch %{ix86} %{arm}
 # libomptarget is not supported on 32-bit systems.
+# s390x does not support the offloading plugins.
+%ifnarch s390x riscv64
 %{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
 %{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
+%endif
 %{_libdir}/libomptarget.so.%{so_suffix}
 %endif
 
 %files devel
 %{_prefix}/lib/clang/%{maj_ver}/include/omp.h
+%{_prefix}/lib/clang/%{maj_ver}/include/ompx.h
 %ifnarch %{arm}
 %{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
 %{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
@@ -139,9 +143,12 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
 %ifnarch %{ix86} %{arm}
 # libomptarget is not supported on 32-bit systems.
+# s390x does not support the offloading plugins.
+%ifnarch s390x riscv64
 %{_libdir}/libomptarget.rtl.amdgpu.so
 %{_libdir}/libomptarget.rtl.cuda.so
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so
+%endif
 %{_libdir}/libomptarget.devicertl.a
 %{_libdir}/libomptarget-amdgpu-*.bc
 %{_libdir}/libomptarget-nvptx-*.bc
@@ -149,6 +156,21 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 
 %changelog
+* Thu Mar 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 18.1.1-1.0.riscv64
+- Add support for riscv64
+
+* Wed Mar 13 2024 Tom Stellard <tstellar@redhat.com> - 18.1.1-1
+- 18.1.1 Release
+
+* Thu Feb 29 2024 Tom Stellard <tstellar@redhat.com> - 18.1.0~rc4-1
+- 18.1.0-rc4 Release
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 17.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 %{?llvm_snapshot_changelog_entry}
 
 * Wed Nov 29 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-1

sources

@@ -1,2 +1,2 @@
-SHA512 (openmp-17.0.6.src.tar.xz) = 836c48db873e3da64835913c2c1d80efaebdfc7061f153acc7b478ea0d73b9c546a09d70dd1465e3e92684947c4a9cb197886b29cbd42418a778faa56b08cc5e
-SHA512 (openmp-17.0.6.src.tar.xz.sig) = 58fb951620d3494e016f0eeefb1cd28d86eb9ecc7894163ed96e8818573f6ed6b6f58d63884799fd052c943e5a63dec39193039f8499b99a55bfd8316c24a55f
+SHA512 (openmp-18.1.1.src.tar.xz) = 4b6db9d06881a640337aa18f185491d73a7eb2a52e70d3bbc1d5ab5011c7a5f8b0b1f4c7c6278833c6476ad86af004d2e50746e86e762dd5354f8424a54d069f
+SHA512 (openmp-18.1.1.src.tar.xz.sig) = 800b9eae15fe41061b345b4ea6a1eef0a748e67c40308fbd94302154f049c401ed65771f5c47c427a9b1e041fea68817799162632cd987ec117cc00aabd93df5