packages/llvm/llvm15-thread.patch

+diff --git a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
+index 1f2a50667c4f..d3ff232f6bd3 100644
+--- a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
++++ b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
+@@ -280,4 +280,5 @@ if (NOT LIBOMPTARGET_CUDA_TOOLKIT_ROOT_DIR_PRESET AND
+   endif()
+ endif()
+ 
+-set(OPENMP_PTHREAD_LIB ${LLVM_PTHREAD_LIB})
++find_package(Threads REQUIRED)
++set(OPENMP_PTHREAD_LIB Threads::Threads)
+diff --git a/openmp/libomptarget/src/CMakeLists.txt b/openmp/libomptarget/src/CMakeLists.txt
+index 071ec61889a2..b782c3b07e6f 100644
+--- a/openmp/libomptarget/src/CMakeLists.txt
++++ b/openmp/libomptarget/src/CMakeLists.txt
+@@ -33,6 +33,7 @@ add_llvm_library(omptarget
+   LINK_LIBS 
+   PRIVATE
+   ${CMAKE_DL_LIBS}
++  ${OPENMP_PTHREAD_LIB}
+   "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
+   NO_INSTALL_RPATH
+ )

packages/llvm/llvm7-0002-libclang-Add-support-for-obtaining-fully-qualified-n.patch → packages/llvm/llvm16-0002-libclang-Add-support-for-obtaining-fully-qualified-n.patch

-From 18b47d781d631667a40a543383cf2510968440e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johann=20Kl=C3=A4hn?= <johann@jklaehn.de>
-Date: Fri, 3 Nov 2017 11:17:59 +0100
-Subject: [PATCH 2/5] [libclang] Add support for obtaining fully qualified
- names of types
-
-This patch allows retrieving the fully qualified names of types
-through libclang and clang.cindex (Python).
----
- tools/clang/bindings/python/clang/cindex.py             | 13 ++++++++++++
- tools/clang/bindings/python/tests/cindex/test_cursor.py |  8 ++++++++
- tools/clang/include/clang-c/Index.h                     |  8 ++++++++
- tools/clang/tools/libclang/CMakeLists.txt               |  1 +
- tools/clang/tools/libclang/CXType.cpp                   | 22 +++++++++++++++++++++
- tools/clang/tools/libclang/libclang.exports             |  1 +
- 6 files changed, 53 insertions(+)
-
-diff --git a/tools/clang/bindings/python/clang/cindex.py b/tools/clang/bindings/python/clang/cindex.py
-index 56fcc78763..becf745040 100644
---- a/tools/clang/bindings/python/clang/cindex.py
-+++ b/tools/clang/bindings/python/clang/cindex.py
-@@ -2401,6 +2401,14 @@ class Type(Structure):
+diff -pur spack-src/clang/bindings/python/clang/cindex.py spack-src-new/clang/bindings/python/clang/cindex.py
+--- spack-src/clang/bindings/python/clang/cindex.py	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/bindings/python/clang/cindex.py	2025-02-03 18:35:08.767069975 +0100
+@@ -2428,6 +2428,14 @@ class Type(Structure):
          """Retrieve the spelling of this Type."""
          return conf.lib.clang_getTypeSpelling(self)
  
@@ -34,23 +16,22 @@ index 56fcc78763..becf745040 100644
      def __eq__(self, other):
          if type(other) != type(self):
              return False
-@@ -3847,6 +3855,11 @@ functionList = [
+@@ -3869,6 +3877,11 @@ functionList = [
+    [Type],
     _CXString,
     _CXString.from_result),
- 
++
 +  ("clang_getFullyQualifiedTypeName",
 +   [Type],
 +   _CXString,
 +   _CXString.from_result),
-+
+ 
    ("clang_hashCursor",
     [Cursor],
-    c_uint),
-diff --git a/tools/clang/bindings/python/tests/cindex/test_cursor.py b/tools/clang/bindings/python/tests/cindex/test_cursor.py
-index f5733fd158..26d5f01b23 100644
---- a/tools/clang/bindings/python/tests/cindex/test_cursor.py
-+++ b/tools/clang/bindings/python/tests/cindex/test_cursor.py
-@@ -311,6 +311,14 @@ class TestCursor(unittest.TestCase):
+diff -pur spack-src/clang/bindings/python/tests/cindex/test_cursor.py spack-src-new/clang/bindings/python/tests/cindex/test_cursor.py
+--- spack-src/clang/bindings/python/tests/cindex/test_cursor.py	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/bindings/python/tests/cindex/test_cursor.py	2025-02-03 18:35:08.767069975 +0100
+@@ -316,6 +316,14 @@ class TestCursor(unittest.TestCase):
          underlying = typedef.underlying_typedef_type
          self.assertEqual(underlying.kind, TypeKind.INT)
  
@@ -65,15 +46,22 @@ index f5733fd158..26d5f01b23 100644
      def test_semantic_parent(self):
          tu = get_tu(kParentTest, 'cpp')
          curs = get_cursors(tu, 'f')
-diff --git a/tools/clang/include/clang-c/Index.h b/tools/clang/include/clang-c/Index.h
-index 65dada38b0..a9bd6f4ebf 100644
---- a/tools/clang/include/clang-c/Index.h
-+++ b/tools/clang/include/clang-c/Index.h
-@@ -3318,6 +3318,14 @@ CINDEX_LINKAGE CXType clang_getCursorType(CXCursor C);
+diff -pur spack-src/clang/include/clang-c/Index.h spack-src-new/clang/include/clang-c/Index.h
+--- spack-src/clang/include/clang-c/Index.h	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/include/clang-c/Index.h	2025-02-03 18:35:52.971255790 +0100
+@@ -33,7 +33,7 @@
+  * compatible, thus CINDEX_VERSION_MAJOR is expected to remain stable.
   */
+ #define CINDEX_VERSION_MAJOR 0
+-#define CINDEX_VERSION_MINOR 63
++#define CINDEX_VERSION_MINOR 64
+ 
+ #define CINDEX_VERSION_ENCODE(major, minor) (((major)*10000) + ((minor)*1))
+ 
+@@ -3447,6 +3447,14 @@ CINDEX_LINKAGE CXType clang_getCursorTyp
  CINDEX_LINKAGE CXString clang_getTypeSpelling(CXType CT);
  
-+/**
+ /**
 + * Retrieve the fully qualified name of the underlying type.
 + * This includes full qualification of all template parameters etc.
 + *
@@ -81,26 +69,25 @@ index 65dada38b0..a9bd6f4ebf 100644
 + */
 +CINDEX_LINKAGE CXString clang_getFullyQualifiedTypeName(CXType CT);
 +
- /**
++/**
   * Retrieve the underlying type of a typedef declaration.
   *
-diff --git a/tools/clang/tools/libclang/CMakeLists.txt b/tools/clang/tools/libclang/CMakeLists.txt
-index e539c8308e..336a5c2e98 100644
---- a/tools/clang/tools/libclang/CMakeLists.txt
-+++ b/tools/clang/tools/libclang/CMakeLists.txt
-@@ -41,6 +41,7 @@ set(LIBS
-   clangLex
+  * If the cursor does not reference a typedef declaration, an invalid type is
+diff -pur spack-src/clang/tools/libclang/CMakeLists.txt spack-src-new/clang/tools/libclang/CMakeLists.txt
+--- spack-src/clang/tools/libclang/CMakeLists.txt	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/tools/libclang/CMakeLists.txt	2025-02-03 18:35:11.263080474 +0100
+@@ -52,6 +52,7 @@ set(LIBS
    clangSema
+   clangSerialization
    clangTooling
 +  clangToolingCore
  )
  
  if (CLANG_ENABLE_ARCMT)
-diff --git a/tools/libclang/CXType.cpp b/tools/libclang/CXType.cpp
-index 7c0f307944..9651c3a84a 100644
---- a/tools/clang/tools/libclang/CXType.cpp
-+++ b/tools/clang/tools/libclang/CXType.cpp
-@@ -20,6 +20,7 @@
+diff -pur spack-src/clang/tools/libclang/CXType.cpp spack-src-new/clang/tools/libclang/CXType.cpp
+--- spack-src/clang/tools/libclang/CXType.cpp	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/tools/libclang/CXType.cpp	2025-02-03 18:35:11.263080474 +0100
+@@ -19,6 +19,7 @@
  #include "clang/AST/DeclObjC.h"
  #include "clang/AST/DeclTemplate.h"
  #include "clang/AST/Expr.h"
@@ -108,7 +95,7 @@ index 7c0f307944..9651c3a84a 100644
  #include "clang/AST/Type.h"
  #include "clang/Basic/AddressSpaces.h"
  #include "clang/Frontend/ASTUnit.h"
-@@ -293,6 +294,27 @@ CXString clang_getTypeSpelling(CXType CT) {
+@@ -303,6 +304,27 @@ CXString clang_getTypeSpelling(CXType CT
    return cxstring::createDup(OS.str());
  }
  
@@ -136,18 +123,14 @@ index 7c0f307944..9651c3a84a 100644
  CXType clang_getTypedefDeclUnderlyingType(CXCursor C) {
    using namespace cxcursor;
    CXTranslationUnit TU = cxcursor::getCursorTU(C);
-diff --git a/tools/clang/tools/libclang/libclang.exports b/tools/clang/tools/libclang/libclang.exports
-index 95a42712c4..87773b9036 100644
---- a/tools/clang/tools/libclang/libclang.exports
-+++ b/tools/clang/tools/libclang/libclang.exports
-@@ -230,6 +230,7 @@ clang_getFileLocation
- clang_getFileName
- clang_getFileTime
- clang_getFileUniqueID
-+clang_getFullyQualifiedTypeName
- clang_getFunctionTypeCallingConv
- clang_getIBOutletCollectionType
- clang_getIncludedFile
--- 
-2.18.0
-
+diff -pur spack-src/clang/tools/libclang/libclang.map spack-src-new/clang/tools/libclang/libclang.map
+--- spack-src/clang/tools/libclang/libclang.map	2022-01-20 22:31:59.000000000 +0100
++++ spack-src-new/clang/tools/libclang/libclang.map	2025-02-03 18:36:14.531346336 +0100
+@@ -303,6 +303,7 @@ LLVM_13 {
+     clang_getFileName;
+     clang_getFileTime;
+     clang_getFileUniqueID;
++    clang_getFullyQualifiedTypeName;
+     clang_getFunctionTypeCallingConv;
+     clang_getIBOutletCollectionType;
+     clang_getIncludedFile;

packages/llvm/llvm17-18-thread.patch

+diff --git a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
+index 1f2a50667c4f..d3ff232f6bd3 100644
+--- a/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
++++ b/openmp/libomptarget/cmake/Modules/LibomptargetGetDependencies.cmake
+@@ -280,4 +280,5 @@ if (NOT LIBOMPTARGET_CUDA_TOOLKIT_ROOT_DIR_PRESET AND
+   endif()
+ endif()
+ 
+-set(OPENMP_PTHREAD_LIB ${LLVM_PTHREAD_LIB})
++find_package(Threads REQUIRED)
++set(OPENMP_PTHREAD_LIB Threads::Threads)
+diff --git a/openmp/libomptarget/src/CMakeLists.txt b/openmp/libomptarget/src/CMakeLists.txt
+index 071ec61889a2..b782c3b07e6f 100644
+--- a/openmp/libomptarget/src/CMakeLists.txt.orig	2024-03-26 14:30:52.000000000 +0900
++++ b/openmp/libomptarget/src/CMakeLists.txt	2024-03-26 14:34:02.000000000 +0900
+@@ -41,5 +41,6 @@
+ 
+ if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+   target_link_libraries(omptarget PRIVATE
++    ${OPENMP_PTHREAD_LIB}
+     "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
+ endif()