From aa1ae5250a5623082f4c312cf8e541765617adc7 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Fri, 12 Aug 2022 18:33:53 +0200
Subject: Use llvm13-thread.patch for all compilers when building llvm (#31661)

---
 .../builtin/packages/llvm/llvm13-14-thread.patch      | 19 +++++++++++++++++++
 .../repos/builtin/packages/llvm/llvm13-thread.patch   | 19 -------------------
 var/spack/repos/builtin/packages/llvm/package.py      |  4 +++-
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch
 delete mode 100644 var/spack/repos/builtin/packages/llvm/llvm13-thread.patch

diff --git a/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch b/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch
new file mode 100644
index 0000000000..0067a93037
--- /dev/null
+++ b/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch
@@ -0,0 +1,19 @@
+--- spack-src/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake.org	2022-02-08 14:58:13.000000000 +0900
++++ spack-src/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake	2022-02-08 13:58:53.000000000 +0900
+@@ -276,4 +276,5 @@
+   endif()
+ endif()
+
+-set(OPENMP_PTHREAD_LIB ${LLVM_PTHREAD_LIB})
++find_package(Threads REQUIRED)
++set(OPENMP_PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
+--- spack-src/openmp/libomptarget/src/CMakeLists.txt.org	2022-02-09 08:49:35.000000000 +0900
++++ spack-src/openmp/libomptarget/src/CMakeLists.txt	2022-02-09 08:50:18.000000000 +0900
+@@ -36,6 +36,7 @@
+ endif()
+ target_link_libraries(omptarget PRIVATE
+   ${CMAKE_DL_LIBS}
++  ${OPENMP_PTHREAD_LIB}
+   "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
+ 
+ # Install libomptarget under the lib destination folder.
diff --git a/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch b/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch
deleted file mode 100644
index 0067a93037..0000000000
--- a/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- spack-src/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake.org	2022-02-08 14:58:13.000000000 +0900
-+++ spack-src/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake	2022-02-08 13:58:53.000000000 +0900
-@@ -276,4 +276,5 @@
-   endif()
- endif()
-
--set(OPENMP_PTHREAD_LIB ${LLVM_PTHREAD_LIB})
-+find_package(Threads REQUIRED)
-+set(OPENMP_PTHREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
---- spack-src/openmp/libomptarget/src/CMakeLists.txt.org	2022-02-09 08:49:35.000000000 +0900
-+++ spack-src/openmp/libomptarget/src/CMakeLists.txt	2022-02-09 08:50:18.000000000 +0900
-@@ -36,6 +36,7 @@
- endif()
- target_link_libraries(omptarget PRIVATE
-   ${CMAKE_DL_LIBS}
-+  ${OPENMP_PTHREAD_LIB}
-   "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
- 
- # Install libomptarget under the lib destination folder.
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 7c147764e9..fefeabbb51 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -356,7 +356,9 @@ class Llvm(CMakePackage, CudaPackage):
 
     # add -lpthread to build OpenMP libraries with Fujitsu compiler
     patch("llvm12-thread.patch", when="@12 %fj")
-    patch("llvm13-thread.patch", when="@13 %fj")
+
+    # add -lpthread to build OpenMP libraries
+    patch("llvm13-14-thread.patch", when="@13:14")
 
     # avoid build failed with Fujitsu compiler
     patch("llvm13-fujitsu.patch", when="@13 %fj")
-- 
cgit v1.2.3-70-g09d2