Squashed merge of upstream-snapshot branch

This commit is contained in:
Tom Stellard 2024-02-10 05:45:08 +00:00
parent 9581483688
commit ad15cca3b2
1 changed files with 9 additions and 0 deletions

View File

@ -18,6 +18,8 @@
%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix} %global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
%endif %endif
%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
%global toolchain clang %global toolchain clang
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer # Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
@ -123,14 +125,18 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%endif %endif
%ifnarch %{ix86} %{arm} %ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems. # libomptarget is not supported on 32-bit systems.
# s390x does not support the offloading plugins.
%ifnarch s390x
%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix} %{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix} %{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix} %{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
%endif
%{_libdir}/libomptarget.so.%{so_suffix} %{_libdir}/libomptarget.so.%{so_suffix}
%endif %endif
%files devel %files devel
%{_prefix}/lib/clang/%{maj_ver}/include/omp.h %{_prefix}/lib/clang/%{maj_ver}/include/omp.h
%{_prefix}/lib/clang/%{maj_ver}/include/ompx.h
%ifnarch %{arm} %ifnarch %{arm}
%{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h %{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
%{_prefix}/lib/clang/%{maj_ver}/include/ompt.h %{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
@ -139,9 +145,12 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
%ifnarch %{ix86} %{arm} %ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems. # libomptarget is not supported on 32-bit systems.
# s390x does not support the offloading plugins.
%ifnarch s390x
%{_libdir}/libomptarget.rtl.amdgpu.so %{_libdir}/libomptarget.rtl.amdgpu.so
%{_libdir}/libomptarget.rtl.cuda.so %{_libdir}/libomptarget.rtl.cuda.so
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so %{_libdir}/libomptarget.rtl.%{libomp_arch}.so
%endif
%{_libdir}/libomptarget.devicertl.a %{_libdir}/libomptarget.devicertl.a
%{_libdir}/libomptarget-amdgpu-*.bc %{_libdir}/libomptarget-amdgpu-*.bc
%{_libdir}/libomptarget-nvptx-*.bc %{_libdir}/libomptarget-nvptx-*.bc