- up to 14.0.6

- added x86 patch (disable waitpkg usage on x86)

diff --git a/llvm-openmp.spec b/llvm-openmp.spec
index d7dcb603c836f2f0e177007cde609459ba4e4bb9..b6fdb3aca525f69e28ee3e308acc378515aa60ea 100644 (file)
--- a/llvm-openmp.spec
+++ b/llvm-openmp.spec
@@ -6,13 +6,14 @@
 Summary:       Intel OpenMP runtime library implementation for use with Clang
 Summary(pl.UTF-8):     Implementacja biblioteki uruchomieniowej OpenMP firmy Intel dla kompilatora Clang
 Name:          llvm-openmp
-Version:       12.0.1
+Version:       14.0.6
 Release:       1
 License:       BSD-like or MIT (OMP), Apache v2.0 (Archer)
 Group:         Libraries
 #Source0Download: https://github.com/llvm/llvm-project/releases/
 Source0:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/openmp-%{version}.src.tar.xz
-# Source0-md5: 761bfb2ce2c69c92745f1a9d45dc7601
+# Source0-md5: b94978b13a7d411f6a448322dcc4954e
+Patch0:                openmp-x86.patch
 URL:           https://openmp.llvm.org/
 BuildRequires: cmake >= 3.13.4
 %{?with_fortran:BuildRequires: gcc-fortran}
@@ -72,6 +73,7 @@ Moduły Fortranu implementacji OpenMP firmy Intel.
 
 %prep
 %setup -q -n openmp-%{version}.src
+%patch0 -p1
 
 %build
 install -d build
@@ -83,6 +85,7 @@ libsubdir=%{_lib}
 %endif
        -DLIBOMP_LIBDIR_SUFFIX="${libsuffix#lib}" \
        %{?with_fortran:-DLIBOMP_FORTRAN_MODULES=ON}
+# -DLLVM_ENABLE_SPHINX=ON needs llvm sources
 
 %{__make}
 
@@ -103,9 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CREDITS.txt LICENSE.txt www/{README.txt,Reference.pdf,*.{html,css}}
+%doc CREDITS.txt LICENSE.TXT README.rst docs/ReleaseNotes.rst
 %attr(755,root,root) %{_libdir}/libarcher.so
 %attr(755,root,root) %{_libdir}/libomp.so
+%attr(755,root,root) %{_libdir}/libompd.so
+%attr(755,root,root) %{_libdir}/libomptarget.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -115,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/omp-tools.h
 %{_includedir}/ompt.h
 %{_includedir}/ompt-multiplex.h
+%{_libdir}/cmake/openmp
 
 %if %{with fortran}
 %files fortran-devel

diff --git a/openmp-x86.patch b/openmp-x86.patch
new file mode 100644 (file)
index 0000000..ece9fd4
--- /dev/null
+++ b/openmp-x86.patch
@@ -0,0 +1,13 @@
+KMP_HAVE_UMWAIT code has some expectations not compatible with 32-bit mode
+
+--- openmp-14.0.6.src/runtime/src/kmp_os.h.orig        2022-06-22 18:46:24.000000000 +0200
++++ openmp-14.0.6.src/runtime/src/kmp_os.h     2022-06-25 21:29:05.944655684 +0200
+@@ -288,7 +288,7 @@ template <> struct traits_t<unsigned lon
+   ((KMP_ARCH_X86 || KMP_ARCH_X86_64) && (KMP_OS_LINUX || KMP_OS_WINDOWS) &&    \
+    !KMP_MIC2)
+ #define KMP_HAVE_UMWAIT                                                        \
+-  ((KMP_ARCH_X86 || KMP_ARCH_X86_64) && (KMP_OS_LINUX || KMP_OS_WINDOWS) &&    \
++  ((KMP_ARCH_X86_64) && (KMP_OS_LINUX || KMP_OS_WINDOWS) &&    \
+    !KMP_MIC)
+ 
+ #if KMP_OS_WINDOWS