···

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       
28
       
28
       
 
       


     

       
29
       
29
       
-
       
- LLVM 12, 13, and 14 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       
29
       
29
       
+
       
- LLVM 12, 13, 14, and 15 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
- GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

     

       
32
       
32
       
 
       


     

···

       
1
       
1
       
-
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
-
       
index c27beec313d7..480f13e73c9f 100644

     

       
3
       
3
       
-
       
--- a/CMakeLists.txt

     

       
4
       
4
       
-
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE)

     

       
6
       
6
       
-
       
   if (NOT LLVM_CONFIG_FOUND)

     

       
7
       
7
       
-
       
     # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       
8
       
8
       
-
       
     # path is removed.

     

       
9
       
9
       
-
       
-    set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")

     

       
10
       
10
       
-
       
+    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       
11
       
11
       
-
       
     set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       
12
       
12
       
-
       
     # N.B. this is just a default value, the CACHE PATHs below can be overriden.

     

       
13
       
13
       
-
       
     set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       
14
       
14
       
-
       
     set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

     

       
15
       
15
       
-
       
     set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

     

       
16
       
16
       
-
       
+  else()

     

       
17
       
17
       
-
       
+    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       
18
       
18
       
-
       
   endif()

     

       
19
       
19
       
-
       
 

     

       
20
       
20
       
-
       
-  set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

     

       
21
       
21
       
-
       
+  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       
22
       
22
       
-
       
   set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       
23
       
23
       
-
       
   set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       
24
       
24
       
-
       
   set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")

     

       
25
       
25
       
-
       
@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE)

     

       
26
       
26
       
-
       
     set(LLVM_INCLUDE_TESTS ON)

     

       
27
       
27
       
-
       
   endif()

     

       
28
       
28
       
-
       
 

     

       
29
       
29
       
-
       
-  include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")

     

       
30
       
30
       
-
       
+  include_directories(${LLVM_INCLUDE_DIRS})

     

       
31
       
31
       
-
       
   link_directories("${LLVM_LIBRARY_DIR}")

     

       
32
       
32
       
-
       
 

     

       
33
       
33
       
-
       
   set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

     

       
34
       
34
       
-
       
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

     

       
35
       
35
       
-
       
index 21ac332e4f5f..b16c314bd1e2 100644

     

       
36
       
36
       
-
       
--- a/cmake/modules/AddClang.cmake

     

       
37
       
37
       
-
       
+++ b/cmake/modules/AddClang.cmake

     

       
38
       
38
       
-
       
@@ -119,8 +119,8 @@ macro(add_clang_library name)

     

       
39
       
39
       
-
       
         install(TARGETS ${lib}

     

       
40
       
40
       
-
       
           COMPONENT ${lib}

     

       
41
       
41
       
-
       
           ${export_to_clangtargets}

     

       
42
       
42
       
-
       
-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       
43
       
43
       
-
       
-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       
44
       
44
       
-
       
+          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       
45
       
45
       
-
       
+          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       
46
       
46
       
-
       
           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       
47
       
47
       
-
       
 

     

       
48
       
48
       
-
       
         if (NOT LLVM_ENABLE_IDE)

     

       
49
       
49
       
-
       
diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

     

       
50
       
50
       
-
       
index 6e2060991b92..b9bc930d26b8 100644

     

       
51
       
51
       
-
       
--- a/lib/Headers/CMakeLists.txt

     

       
52
       
52
       
-
       
+++ b/lib/Headers/CMakeLists.txt

     

       
53
       
53
       
-
       
@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files})

     

       
54
       
54
       
-
       
 add_header_target("windows-resource-headers" ${windows_only_files})

     

       
55
       
55
       
-
       
 add_header_target("utility-resource-headers" ${utility_files})

     

       
56
       
56
       
-
       
 

     

       
57
       
57
       
-
       
-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

     

       
58
       
58
       
-
       
+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

     

       
59
       
59
       
-
       
 

     

       
60
       
60
       
-
       
 #############################################################

     

       
61
       
61
       
-
       
 # Install rules for the catch-all clang-resource-headers target

     

       
62
       
62
       
-
       
diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

     

       
63
       
63
       
-
       
index 8d95d0900e8c..ebc70ff7526d 100644

     

       
64
       
64
       
-
       
--- a/tools/libclang/CMakeLists.txt

     

       
65
       
65
       
-
       
+++ b/tools/libclang/CMakeLists.txt

     

       
66
       
66
       
-
       
@@ -180,7 +180,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

     

       
67
       
67
       
-
       
           COMPONENT

     

       
68
       
68
       
-
       
             libclang-python-bindings

     

       
69
       
69
       
-
       
           DESTINATION

     

       
70
       
70
       
-
       
-            "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

     

       
71
       
71
       
-
       
+            "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

     

       
72
       
72
       
-
       
 endforeach()

     

       
73
       
73
       
-
       
 if(NOT LLVM_ENABLE_IDE)

     

       
74
       
74
       
-
       
   add_custom_target(libclang-python-bindings)

     

       
75
       
75
       
-
       
diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt

     

       
76
       
76
       
-
       
index 061dc7ef4dd9..adc54b2edc32 100644

     

       
77
       
77
       
-
       
--- a/tools/scan-build-py/CMakeLists.txt

     

       
78
       
78
       
-
       
+++ b/tools/scan-build-py/CMakeLists.txt

     

       
79
       
79
       
-
       
@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})

     

       
80
       
80
       
-
       
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

     

       
81
       
81
       
-
       
   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

     

       
82
       
82
       
-
       
   install(PROGRAMS lib/libscanbuild/${lib}

     

       
83
       
83
       
-
       
-          DESTINATION lib/libscanbuild

     

       
84
       
84
       
-
       
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       
85
       
85
       
-
       
           COMPONENT scan-build-py)

     

       
86
       
86
       
-
       
 endforeach()

     

       
87
       
87
       
-
       
 

     

       
88
       
88
       
-
       
@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})

     

       
89
       
89
       
-
       
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

     

       
90
       
90
       
-
       
   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

     

       
91
       
91
       
-
       
   install(PROGRAMS lib/libscanbuild/resources/${resource}

     

       
92
       
92
       
-
       
-          DESTINATION lib/libscanbuild/resources

     

       
93
       
93
       
-
       
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

     

       
94
       
94
       
-
       
           COMPONENT scan-build-py)

     

       
95
       
95
       
-
       
 endforeach()

     

       
96
       
96
       
-
       
 

     

       
97
       
97
       
-
       
@@ -122,7 +122,7 @@ foreach(lib ${LibEar})

     

       
98
       
98
       
-
       
                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

     

       
99
       
99
       
-
       
   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

     

       
100
       
100
       
-
       
   install(PROGRAMS lib/libear/${lib}

     

       
101
       
101
       
-
       
-          DESTINATION lib/libear

     

       
102
       
102
       
-
       
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       
103
       
103
       
-
       
           COMPONENT scan-build-py)

     

       
104
       
104
       
-
       
 endforeach()

     

       
105
       
105
       
-
       
 

     

···

       
1
       
1
       
-
       
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake

     

       
2
       
2
       
-
       
index f1f46fb9599c..6f19e69507ba 100644

     

       
3
       
3
       
-
       
--- a/cmake/Modules/CompilerRTUtils.cmake

     

       
4
       
4
       
-
       
+++ b/cmake/Modules/CompilerRTUtils.cmake

     

       
5
       
5
       
-
       
@@ -302,8 +302,9 @@ macro(load_llvm_config)

     

       
6
       
6
       
-
       
     # Get some LLVM variables from LLVMConfig.

     

       
7
       
7
       
-
       
     include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake")

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
-    set(LLVM_LIBRARY_OUTPUT_INTDIR

     

       
10
       
10
       
-
       
-      ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})

     

       
11
       
11
       
-
       
+    get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR

     

       
12
       
12
       
-
       
+      ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}

     

       
13
       
13
       
-
       
+      REALPATH)

     

       
14
       
14
       
-
       
   endif()

     

       
15
       
15
       
-
       
 endmacro()

     

       
16
       
16
       
-
       
 

     

···

       
1
       
1
       
-
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
-
       
index dcc649629a4b..58dca54642e4 100644

     

       
3
       
3
       
-
       
--- a/CMakeLists.txt

     

       
4
       
4
       
-
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE)

     

       
6
       
6
       
-
       
   if (NOT LLVM_CONFIG_FOUND)

     

       
7
       
7
       
-
       
     # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       
8
       
8
       
-
       
     # path is removed.

     

       
9
       
9
       
-
       
-    set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")

     

       
10
       
10
       
-
       
+    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       
11
       
11
       
-
       
     set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       
12
       
12
       
-
       
     # N.B. this is just a default value, the CACHE PATHs below can be overridden.

     

       
13
       
13
       
-
       
     set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       
14
       
14
       
-
       
+  else()

     

       
15
       
15
       
-
       
+    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       
16
       
16
       
-
       
   endif()

     

       
17
       
17
       
-
       
 

     

       
18
       
18
       
-
       
-  set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

     

       
19
       
19
       
-
       
+  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       
20
       
20
       
-
       
   set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       
21
       
21
       
-
       
   set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       
22
       
22
       
-
       
 

     

       
23
       
23
       
-
       
@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE)

     

       
24
       
24
       
-
       
 

     

       
25
       
25
       
-
       
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")

     

       
26
       
26
       
-
       
 

     

       
27
       
27
       
-
       
-  include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})

     

       
28
       
28
       
-
       
+  include_directories(${LLVM_INCLUDE_DIRS})

     

       
29
       
29
       
-
       
   link_directories(${LLVM_LIBRARY_DIRS})

     

       
30
       
30
       
-
       
 

     

       
31
       
31
       
-
       
   if(LLVM_INCLUDE_TESTS)

     

       
32
       
32
       
-
       
diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake

     

       
33
       
33
       
-
       
index d3924f7243d4..42a7cd62281c 100644

     

       
34
       
34
       
-
       
--- a/cmake/modules/AddLLD.cmake

     

       
35
       
35
       
-
       
+++ b/cmake/modules/AddLLD.cmake

     

       
36
       
36
       
-
       
@@ -18,8 +18,8 @@ macro(add_lld_library name)

     

       
37
       
37
       
-
       
     install(TARGETS ${name}

     

       
38
       
38
       
-
       
       COMPONENT ${name}

     

       
39
       
39
       
-
       
       ${export_to_lldtargets}

     

       
40
       
40
       
-
       
-      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       
41
       
41
       
-
       
-      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       
42
       
42
       
-
       
+      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       
43
       
43
       
-
       
+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

     

       
44
       
44
       
-
       
       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       
45
       
45
       
-
       
 

     

       
46
       
46
       
-
       
     if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)

     

···

       
1
       
1
       
-
       
--- a/source/Plugins/Process/Linux/Procfs.h

     

       
2
       
2
       
-
       
+++ b/source/Plugins/Process/Linux/Procfs.h

     

       
3
       
3
       
-
       
@@ -10,6 +10,13 @@

     

       
4
       
4
       
-
       
 // sys/procfs.h on Android/Linux for all supported architectures.

     

       
5
       
5
       
-
       
 

     

       
6
       
6
       
-
       
 #include <sys/ptrace.h>

     

       
7
       
7
       
-
       
+#include <asm/ptrace.h>

     

       
8
       
8
       
-
       
+

     

       
9
       
9
       
-
       
+// on i686 preprocessor symbols with these register names are defined as

     

       
10
       
10
       
-
       
+// numeric constants; these symbols clash with identifier names used in

     

       
11
       
11
       
-
       
+// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h`

     

       
12
       
12
       
-
       
+#undef FS

     

       
13
       
13
       
-
       
+#undef CS

     

       
14
       
14
       
-
       
 

     

       
15
       
15
       
-
       
 #include "lldb/lldb-types.h"

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
@@ -17,23 +24,13 @@

     

       
18
       
18
       
-
       
 

     

       
19
       
19
       
-
       
 #include <vector>

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
-#ifdef __ANDROID__

     

       
22
       
22
       
-
       
-#if defined(__arm64__) || defined(__aarch64__)

     

       
23
       
23
       
-
       
-typedef unsigned long elf_greg_t;

     

       
24
       
24
       
-
       
-typedef elf_greg_t

     

       
25
       
25
       
-
       
-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];

     

       
26
       
26
       
-
       
-typedef struct user_fpsimd_state elf_fpregset_t;

     

       
27
       
27
       
-
       
-#ifndef NT_FPREGSET

     

       
28
       
28
       
-
       
-#define NT_FPREGSET NT_PRFPREG

     

       
29
       
29
       
-
       
-#endif // NT_FPREGSET

     

       
30
       
30
       
-
       
-#elif defined(__mips__)

     

       
31
       
31
       
-
       
-#ifndef NT_FPREGSET

     

       
32
       
32
       
-
       
-#define NT_FPREGSET NT_PRFPREG

     

       
33
       
33
       
-
       
-#endif // NT_FPREGSET

     

       
34
       
34
       
-
       
-#endif

     

       
35
       
35
       
-
       
-#else // __ANDROID__

     

       
36
       
36
       
-
       
+#if !defined(__GLIBC__) && defined(__powerpc__)

     

       
37
       
37
       
-
       
+#define pt_regs musl_pt_regs

     

       
38
       
38
       
-
       
+#include <sys/procfs.h>

     

       
39
       
39
       
-
       
+#undef pt_regs

     

       
40
       
40
       
-
       
+#else

     

       
41
       
41
       
-
       
 #include <sys/procfs.h>

     

       
42
       
42
       
-
       
-#endif // __ANDROID__

     

       
43
       
43
       
-
       
+#endif

     

       
44
       
44
       
-
       
 

     

       
45
       
45
       
-
       
 namespace lldb_private {

     

       
46
       
46
       
-
       
 namespace process_linux {

     

···

       
1
       
1
       
-
       
diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake

     

       
2
       
2
       
-
       
index 37364341ff8b..7f74c1a3e257 100644

     

       
3
       
3
       
-
       
--- a/cmake/modules/LLDBConfig.cmake

     

       
4
       
4
       
-
       
+++ b/cmake/modules/LLDBConfig.cmake

     

       
5
       
5
       
-
       
@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers)

     

       
6
       
6
       
-
       
   # Iterate over the possible places where the external resource directory

     

       
7
       
7
       
-
       
   # could be and pick the first that exists.

     

       
8
       
8
       
-
       
   foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"

     

       
9
       
9
       
-
       
-                    "${LLVM_BUILD_LIBRARY_DIR}"

     

       
10
       
10
       
-
       
+                    "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@"

     

       
11
       
11
       
-
       
                     "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")

     

       
12
       
12
       
-
       
     # Build the resource directory path by appending 'clang/<version number>'.

     

       
13
       
13
       
-
       
     set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}")

     

···

       
1
       
1
       
-
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
-
       
index 45399dc0537e..5d946e9e6583 100644

     

       
3
       
3
       
-
       
--- a/CMakeLists.txt

     

       
4
       
4
       
-
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")

     

       
6
       
6
       
-
       
   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src

     

       
7
       
7
       
-
       
     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)

     

       
8
       
8
       
-
       
   install(TARGETS tf_xla_runtime EXPORT LLVMExports

     

       
9
       
9
       
-
       
-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       
10
       
10
       
-
       
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       
11
       
11
       
-
       
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)

     

       
12
       
12
       
-
       
   # Once we add more modules, we should handle this more automatically.

     

       
13
       
13
       
-
       
   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)

     

       
14
       
14
       
-
       
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake

     

       
15
       
15
       
-
       
index 057431208322..56f0dcb258da 100644

     

       
16
       
16
       
-
       
--- a/cmake/modules/AddLLVM.cmake

     

       
17
       
17
       
-
       
+++ b/cmake/modules/AddLLVM.cmake

     

       
18
       
18
       
-
       
@@ -844,8 +844,8 @@ macro(add_llvm_library name)

     

       
19
       
19
       
-
       
       get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella})

     

       
20
       
20
       
-
       
       install(TARGETS ${name}

     

       
21
       
21
       
-
       
               ${export_to_llvmexports}

     

       
22
       
22
       
-
       
-              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       
23
       
23
       
-
       
-              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       
24
       
24
       
-
       
+              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       
25
       
25
       
-
       
+              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       
26
       
26
       
-
       
               RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       
27
       
27
       
-
       
 

     

       
28
       
28
       
-
       
       if (NOT LLVM_ENABLE_IDE)

     

       
29
       
29
       
-
       
@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type)

     

       
30
       
30
       
-
       
   set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX})

     

       
31
       
31
       
-
       
   set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX})

     

       
32
       
32
       
-
       
 

     

       
33
       
33
       
-
       
-  set(output_dir lib${LLVM_LIBDIR_SUFFIX})

     

       
34
       
34
       
-
       
+  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       
35
       
35
       
-
       
   if(WIN32 AND "${type}" STREQUAL "SHARED")

     

       
36
       
36
       
-
       
     set(output_dir "${CMAKE_INSTALL_BINDIR}")

     

       
37
       
37
       
-
       
   endif()

     

       
38
       
38
       
-
       
@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name)

     

       
39
       
39
       
-
       
 

     

       
40
       
40
       
-
       
   if (APPLE)

     

       
41
       
41
       
-
       
     set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

       
42
       
42
       
-
       
-    set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
43
       
43
       
-
       
+    set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
44
       
44
       
-
       
   elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)

     

       
45
       
45
       
-
       
     # $ORIGIN is not interpreted at link time by aix ld.

     

       
46
       
46
       
-
       
     # Since BUILD_SHARED_LIBS is only recommended for use by developers,

     

       
47
       
47
       
-
       
     # hardcode the rpath to build/install lib dir first in this mode.

     

       
48
       
48
       
-
       
     # FIXME: update this when there is better solution.

     

       
49
       
49
       
-
       
-    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
50
       
50
       
-
       
+    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
51
       
51
       
-
       
   elseif(UNIX)

     

       
52
       
52
       
-
       
-    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
53
       
53
       
-
       
+    set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       
54
       
54
       
-
       
     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")

     

       
55
       
55
       
-
       
       set_property(TARGET ${name} APPEND_STRING PROPERTY

     

       
56
       
56
       
-
       
                    LINK_FLAGS " -Wl,-z,origin ")

     

       
57
       
57
       
-
       
diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake

     

       
58
       
58
       
-
       
index 891c9e6d618c..8d963f3b0069 100644

     

       
59
       
59
       
-
       
--- a/cmake/modules/AddOCaml.cmake

     

       
60
       
60
       
-
       
+++ b/cmake/modules/AddOCaml.cmake

     

       
61
       
61
       
-
       
@@ -147,9 +147,9 @@ function(add_ocaml_library name)

     

       
62
       
62
       
-
       
   endforeach()

     

       
63
       
63
       
-
       
 

     

       
64
       
64
       
-
       
   if( APPLE )

     

       
65
       
65
       
-
       
-    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       
66
       
66
       
-
       
+    set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       
67
       
67
       
-
       
   elseif( UNIX )

     

       
68
       
68
       
-
       
-    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       
69
       
69
       
-
       
+    set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       
70
       
70
       
-
       
   endif()

     

       
71
       
71
       
-
       
   list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")

     

       
72
       
72
       
-
       
 

     

       
73
       
73
       
-
       
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt

     

       
74
       
74
       
-
       
index d4b0ab959148..26ed981fd09f 100644

     

       
75
       
75
       
-
       
--- a/cmake/modules/CMakeLists.txt

     

       
76
       
76
       
-
       
+++ b/cmake/modules/CMakeLists.txt

     

       
77
       
77
       
-
       
@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       
78
       
78
       
-
       
   )

     

       
79
       
79
       
-
       
 list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       
80
       
80
       
-
       
 

     

       
81
       
81
       
-
       
-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")

     

       
82
       
82
       
-
       
+extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       
83
       
83
       
-
       
 set(LLVM_CONFIG_LIBRARY_DIRS

     

       
84
       
84
       
-
       
   "${LLVM_CONFIG_LIBRARY_DIR}"

     

       
85
       
85
       
-
       
   # FIXME: Should there be other entries here?

     

       
86
       
86
       
-
       
diff --git a/docs/CMake.rst b/docs/CMake.rst

     

       
87
       
87
       
-
       
index 879b7b231d4c..9c31d14e8950 100644

     

       
88
       
88
       
-
       
--- a/docs/CMake.rst

     

       
89
       
89
       
-
       
+++ b/docs/CMake.rst

     

       
90
       
90
       
-
       
@@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below.

     

       
91
       
91
       
-
       
 **LLVM_LIBDIR_SUFFIX**:STRING

     

       
92
       
92
       
-
       
   Extra suffix to append to the directory where libraries are to be

     

       
93
       
93
       
-
       
   installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64``

     

       
94
       
94
       
-
       
-  to install libraries to ``/usr/lib64``.

     

       
95
       
95
       
-
       
+  to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``.

     

       
96
       
96
       
-
       
 

     

       
97
       
97
       
-
       
 **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING

     

       
98
       
98
       
-
       
   Building the llvm toolchain can use a lot of resources, particularly

     

       
99
       
99
       
-
       
@@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``.

     

       
100
       
100
       
-
       
   The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*.

     

       
101
       
101
       
-
       
   Defaults to "bin".

     

       
102
       
102
       
-
       
 

     

       
103
       
103
       
-
       
+**CMAKE_INSTALL_LIBDIR**:PATH

     

       
104
       
104
       
-
       
+  The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*.

     

       
105
       
105
       
-
       
+  Defaults to "lib".

     

       
106
       
106
       
-
       
+

     

       
107
       
107
       
-
       
 **CMAKE_INSTALL_INCLUDEDIR**:PATH

     

       
108
       
108
       
-
       
   The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*.

     

       
109
       
109
       
-
       
   Defaults to "include".

     

       
110
       
110
       
-
       
diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in

     

       
111
       
111
       
-
       
index 370005cd8d7d..7e790bc52111 100644

     

       
112
       
112
       
-
       
--- a/tools/llvm-config/BuildVariables.inc.in

     

       
113
       
113
       
-
       
+++ b/tools/llvm-config/BuildVariables.inc.in

     

       
114
       
114
       
-
       
@@ -23,6 +23,7 @@

     

       
115
       
115
       
-
       
 #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       
116
       
116
       
-
       
 #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       
117
       
117
       
-
       
 #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

       
118
       
118
       
-
       
+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"

     

       
119
       
119
       
-
       
 #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       
120
       
120
       
-
       
 #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       
121
       
121
       
-
       
 #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       
122
       
122
       
-
       
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp

     

       
123
       
123
       
-
       
index 2c6c55f89d38..f6d2068a0827 100644

     

       
124
       
124
       
-
       
--- a/tools/llvm-config/llvm-config.cpp

     

       
125
       
125
       
-
       
+++ b/tools/llvm-config/llvm-config.cpp

     

       
126
       
126
       
-
       
@@ -369,7 +369,11 @@ int main(int argc, char **argv) {

     

       
127
       
127
       
-
       
       sys::fs::make_absolute(ActivePrefix, Path);

     

       
128
       
128
       
-
       
       ActiveBinDir = std::string(Path.str());

     

       
129
       
129
       
-
       
     }

     

       
130
       
130
       
-
       
-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;

     

       
131
       
131
       
-
       
+    {

     

       
132
       
132
       
-
       
+      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       
133
       
133
       
-
       
+      sys::fs::make_absolute(ActivePrefix, Path);

     

       
134
       
134
       
-
       
+      ActiveLibDir = std::string(Path.str());

     

       
135
       
135
       
-
       
+    }

     

       
136
       
136
       
-
       
     {

     

       
137
       
137
       
-
       
       SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);

     

       
138
       
138
       
-
       
       sys::fs::make_absolute(ActivePrefix, Path);

     

···

       
1
       
1
       
-
       
diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py

     

       
2
       
2
       
-
       
index 0242e0b75af3..d732011306f7 100644

     

       
3
       
3
       
-
       
--- a/utils/lit/lit/TestRunner.py

     

       
4
       
4
       
-
       
+++ b/utils/lit/lit/TestRunner.py

     

       
5
       
5
       
-
       
@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):

     

       
6
       
6
       
-
       
             f.write('@echo off\n')

     

       
7
       
7
       
-
       
         f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands))

     

       
8
       
8
       
-
       
     else:

     

       
9
       
9
       
-
       
+        # This env var is *purged* when invoking subprocesses so we have to

     

       
10
       
10
       
-
       
+        # manually set it from within the bash script in order for the commands

     

       
11
       
11
       
-
       
+        # in run lines to see this var:

     

       
12
       
12
       
-
       
+        if "DYLD_LIBRARY_PATH" in test.config.environment:

     

       
13
       
13
       
-
       
+            f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n')

     

       
14
       
14
       
-
       
+

     

       
15
       
15
       
-
       
         for i, ln in enumerate(commands):

     

       
16
       
16
       
-
       
             match = re.match(kPdbgRegex, ln)

     

       
17
       
17
       
-
       
             if match:

     

       
18
       
18
       
-
       
@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={},

     

       
19
       
19
       
-
       
         return processed

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
     process = processLine if recursion_limit is None else processLineToFixedPoint

     

       
22
       
22
       
-
       
-    

     

       
23
       
23
       
-
       
+

     

       
24
       
24
       
-
       
     return [unescapePercents(process(ln)) for ln in script]

     

       
25
       
25
       
-
       
 

     

       
26
       
26
       
-
       
 

     

···

       
1
       
1
       
-
       
diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py

     

       
2
       
2
       
-
       
index 81e8dc04acea..479ff95681e2 100644

     

       
3
       
3
       
-
       
--- a/test/Unit/lit.cfg.py

     

       
4
       
4
       
-
       
+++ b/test/Unit/lit.cfg.py

     

       
5
       
5
       
-
       
@@ -3,6 +3,7 @@

     

       
6
       
6
       
-
       
 # Configuration file for the 'lit' test runner.

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
 import os

     

       
9
       
9
       
-
       
+import platform

     

       
10
       
10
       
-
       
 import subprocess

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
 import lit.formats

     

       
13
       
13
       
-
       
@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):

     

       
14
       
14
       
-
       
 # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate.

     

       
15
       
15
       
-
       
 if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ:

     

       
16
       
16
       
-
       
     config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE']

     

       
17
       
17
       
-
       
+

     

       
18
       
18
       
-
       
+# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       
19
       
19
       
-
       
+#

     

       
20
       
20
       
-
       
+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       
21
       
21
       
-
       
+def find_shlibpath_var():

     

       
22
       
22
       
-
       
+    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       
23
       
23
       
-
       
+        yield 'LD_LIBRARY_PATH'

     

       
24
       
24
       
-
       
+    elif platform.system() == 'Darwin':

     

       
25
       
25
       
-
       
+        yield 'DYLD_LIBRARY_PATH'

     

       
26
       
26
       
-
       
+    elif platform.system() == 'Windows':

     

       
27
       
27
       
-
       
+        yield 'PATH'

     

       
28
       
28
       
-
       
+    elif platform.system() == 'AIX':

     

       
29
       
29
       
-
       
+        yield 'LIBPATH'

     

       
30
       
30
       
-
       
+

     

       
31
       
31
       
-
       
+for shlibpath_var in find_shlibpath_var():

     

       
32
       
32
       
-
       
+    shlibpath = os.path.pathsep.join(

     

       
33
       
33
       
-
       
+        (config.shlibdir,

     

       
34
       
34
       
-
       
+         config.environment.get(shlibpath_var, '')))

     

       
35
       
35
       
-
       
+    config.environment[shlibpath_var] = shlibpath

     

       
36
       
36
       
-
       
+    break

     

       
37
       
37
       
-
       
+else:

     

       
38
       
38
       
-
       
+    lit_config.warning("unable to inject shared library path on '{}'"

     

       
39
       
39
       
-
       
+                       .format(platform.system()))

     

       
40
       
40
       
-
       
diff --git a/test/lit.cfg.py b/test/lit.cfg.py

     

       
41
       
41
       
-
       
index 75a38b4c5dad..856fc75c9d74 100644

     

       
42
       
42
       
-
       
--- a/test/lit.cfg.py

     

       
43
       
43
       
-
       
+++ b/test/lit.cfg.py

     

       
44
       
44
       
-
       
@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)

     

       
45
       
45
       
-
       
 llvm_config.with_system_environment(

     

       
46
       
46
       
-
       
     ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])

     

       
47
       
47
       
-
       
 

     

       
48
       
48
       
-
       
+# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       
49
       
49
       
-
       
+#

     

       
50
       
50
       
-
       
+# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       
51
       
51
       
-
       
+def find_shlibpath_var():

     

       
52
       
52
       
-
       
+    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       
53
       
53
       
-
       
+        yield 'LD_LIBRARY_PATH'

     

       
54
       
54
       
-
       
+    elif platform.system() == 'Darwin':

     

       
55
       
55
       
-
       
+        yield 'DYLD_LIBRARY_PATH'

     

       
56
       
56
       
-
       
+    elif platform.system() == 'Windows':

     

       
57
       
57
       
-
       
+        yield 'PATH'

     

       
58
       
58
       
-
       
+    elif platform.system() == 'AIX':

     

       
59
       
59
       
-
       
+        yield 'LIBPATH'

     

       
60
       
60
       
-
       
+

     

       
61
       
61
       
-
       
+for shlibpath_var in find_shlibpath_var():

     

       
62
       
62
       
-
       
+    shlibpath = config.llvm_shlib_dir

     

       
63
       
63
       
-
       
+    llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True)

     

       
64
       
64
       
-
       
+    break

     

       
65
       
65
       
-
       
+else:

     

       
66
       
66
       
-
       
+    lit_config.warning("unable to inject shared library path on '{}'"

     

       
67
       
67
       
-
       
+                       .format(platform.system()))

     

       
68
       
68
       
-
       
 

     

       
69
       
69
       
-
       
 # Set up OCAMLPATH to include newly built OCaml libraries.

     

       
70
       
70
       
-
       
 top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml')

     

       
71
       
71
       
-
       
@@ -318,7 +338,7 @@ def have_cxx_shared_library():

     

       
72
       
72
       
-
       
 

     

       
73
       
73
       
-
       
     try:

     

       
74
       
74
       
-
       
         readobj_cmd = subprocess.Popen(

     

       
75
       
75
       
-
       
-            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE)

     

       
76
       
76
       
-
       
+            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment)

     

       
77
       
77
       
-
       
     except OSError:

     

       
78
       
78
       
-
       
         print('could not exec llvm-readobj')

     

       
79
       
79
       
-
       
         return False

     

···

       
1
       
1
       
-
       
diff --git a/test/Bindings/Go/lit.local.cfg b/test/Bindings/Go/lit.local.cfg

     

       
2
       
2
       
-
       
index 91a0ad89..4da83a1a 100644

     

       
3
       
3
       
-
       
--- a/test/Bindings/Go/lit.local.cfg

     

       
4
       
4
       
-
       
+++ b/test/Bindings/Go/lit.local.cfg

     

       
5
       
5
       
-
       
@@ -1,5 +1,4 @@

     

       
6
       
6
       
-
       
 import os

     

       
7
       
7
       
-
       
-import pipes

     

       
8
       
8
       
-
       
 import shlex

     

       
9
       
9
       
-
       
 import sys

     

       
10
       
10
       
-
       
 

     

       
11
       
11
       
-
       
@@ -56,7 +55,7 @@ def fixup_compiler_path(compiler):

     

       
12
       
12
       
-
       
     except (AttributeError, OSError):

     

       
13
       
13
       
-
       
         pass

     

       
14
       
14
       
-
       
 

     

       
15
       
15
       
-
       
-    return ' '.join([pipes.quote(arg) for arg in args])

     

       
16
       
16
       
-
       
+    return ' '.join([shlex.quote(arg) for arg in args])

     

       
17
       
17
       
-
       
 

     

       
18
       
18
       
-
       
 config.environment['CC'] = fixup_compiler_path(config.host_cc)

     

       
19
       
19
       
-
       
 config.environment['CXX'] = fixup_compiler_path(config.host_cxx)

     

···

       
1
       
1
       
-
       
diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt

     

       
2
       
2
       
-
       
index ce66214822a2..6ab7b33c95da 100644

     

       
3
       
3
       
-
       
--- a/libomptarget/DeviceRTL/CMakeLists.txt

     

       
4
       
4
       
-
       
+++ b/libomptarget/DeviceRTL/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -27,10 +27,10 @@ endif()

     

       
6
       
6
       
-
       
 if (LLVM_DIR)

     

       
7
       
7
       
-
       
   # Builds that use pre-installed LLVM have LLVM_DIR set.

     

       
8
       
8
       
-
       
   # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route

     

       
9
       
9
       
-
       
-  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       
10
       
10
       
-
       
+  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       
11
       
11
       
-
       
   find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR}

     

       
12
       
12
       
-
       
-    NO_DEFAULT_PATH)

     

       
13
       
13
       
-
       
-  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       
14
       
14
       
-
       
+    )

     

       
15
       
15
       
-
       
+  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       
16
       
16
       
-
       
   if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL))

     

       
17
       
17
       
-
       
     libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}")

     

       
18
       
18
       
-
       
     return()

     

···

       
1
       
1
       
-
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
-
       
index b6ddbe90516d..311ab1d50e7f 100644

     

       
3
       
3
       
-
       
--- a/CMakeLists.txt

     

       
4
       
4
       
-
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
-
       
@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       
6
       
6
       
-
       
   set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING

     

       
7
       
7
       
-
       
     "Suffix of lib installation directory, e.g. 64 => lib64")

     

       
8
       
8
       
-
       
   # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.

     

       
9
       
9
       
-
       
-  set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")

     

       
10
       
10
       
-
       
+  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
   # Group test settings.

     

       
13
       
13
       
-
       
   set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING

     

       
14
       
14
       
-
       
@@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       
15
       
15
       
-
       
 else()

     

       
16
       
16
       
-
       
   set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})

     

       
17
       
17
       
-
       
   # If building in tree, we honor the same install suffix LLVM uses.

     

       
18
       
18
       
-
       
-  set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")

     

       
19
       
19
       
-
       
+  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
   if (NOT MSVC)

     

       
22
       
22
       
-
       
     set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)

     

···

       
1
       
1
       
-
       
diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake

     

       
2
       
2
       
-
       
--- a/cmake/OpenMPTesting.cmake

     

       
3
       
3
       
-
       
+++ b/cmake/OpenMPTesting.cmake

     

       
4
       
4
       
-
       
@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment)

     

       
5
       
5
       
-
       
   if (${OPENMP_STANDALONE_BUILD})

     

       
6
       
6
       
-
       
     set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS})

     

       
7
       
7
       
-
       
     add_custom_target(${target}

     

       
8
       
8
       
-
       
-      COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS}

     

       
9
       
9
       
-
       
+      COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS}

     

       
10
       
10
       
-
       
       COMMENT ${comment}

     

       
11
       
11
       
-
       
       DEPENDS ${ARG_DEPENDS}

     

       
12
       
12
       
-
       
       USES_TERMINAL

     

···

       
1
       
1
       
-
       
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp

     

       
2
       
2
       
-
       
index 6b6e276b8ce7..7896542a1202 100644

     

       
3
       
3
       
-
       
--- a/lib/Driver/ToolChains/CommonArgs.cpp

     

       
4
       
4
       
-
       
+++ b/lib/Driver/ToolChains/CommonArgs.cpp

     

       
5
       
5
       
-
       
@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
     SmallString<1024> Plugin;

     

       
8
       
8
       
-
       
     llvm::sys::path::native(

     

       
9
       
9
       
-
       
-        Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix,

     

       
10
       
10
       
-
       
+        Twine("@libllvmLibdir@" "/LLVMgold") + Suffix,

     

       
11
       
11
       
-
       
         Plugin);

     

       
12
       
12
       
-
       
     CmdArgs.push_back(Args.MakeArgString(Plugin));

     

       
13
       
13
       
-
       
   }

     

···

       
60
       
60
       
 
       
    })

     

       
61
       
61
       
 
       
    # Pass the correct path to libllvm

     

       
62
       
62
       
 
       
    ++ [

     

       
63
       
63
       
-
       
      (replaceVars

     

       
64
       
64
       
-
       
        (

     

       
65
       
65
       
-
       
          if (lib.versionOlder release_version "16") then

     

       
66
       
66
       
-
       
            ./clang-11-15-LLVMgold-path.patch

     

       
67
       
67
       
-
       
          else

     

       
68
       
68
       
-
       
            ./clang-at-least-16-LLVMgold-path.patch

     

       
69
       
69
       
-
       
        )

     

       
70
       
70
       
-
       
        {

     

       
71
       
71
       
-
       
          libllvmLibdir = "${libllvm.lib}/lib";

     

       
72
       
72
       
-
       
        }

     

       
73
       
73
       
-
       
      )

     

       
63
       
63
       
+
       
      (replaceVars ./clang-at-least-16-LLVMgold-path.patch {

     

       
64
       
64
       
+
       
        libllvmLibdir = "${libllvm.lib}/lib";

     

       
65
       
65
       
+
       
      })

     

       
74
       
66
       
 
       
    ]

     

       
75
       
75
       
-
       
    # Backport version logic from Clang 16. This is needed by the following patch.

     

       
76
       
76
       
-
       
    ++ lib.optional (lib.versions.major release_version == "15") (fetchpatch {

     

       
77
       
77
       
-
       
      name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";

     

       
78
       
78
       
-
       
      url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";

     

       
79
       
79
       
-
       
      includes = [ "lib/Basic/Targets/OSTargets.cpp" ];

     

       
80
       
80
       
-
       
      stripLen = 1;

     

       
81
       
81
       
-
       
      hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs=";

     

       
82
       
82
       
-
       
    })

     

       
83
       
67
       
 
       
    # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.

     

       
84
       
68
       
 
       
    # This is needed by newer SDKs (14+).

     

       
85
       
69
       
 
       
    ++ lib.optional (lib.versionOlder (lib.versions.major release_version) "17") (fetchpatch {

     
···

       
246
       
230
       
 
       
          )

     

       
247
       
231
       
 
       
        ) "stackclashprotection"

     

       
248
       
232
       
 
       
        ++ lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs"

     

       
249
       
249
       
-
       
        ++ lib.optional (lib.versionOlder release_version "16") "strictflexarrays3"

     

       
250
       
233
       
 
       
        ++ (finalAttrs.passthru.hardeningUnsupportedFlags or [ ]);

     

       
251
       
234
       
 
       
    };

     

       
252
       
235
       
 
       


     

···

       
33
       
33
       
 
       
      ++ lib.platforms.x86

     

       
34
       
34
       
 
       
      ++ lib.platforms.riscv

     

       
35
       
35
       
 
       
      ++ lib.platforms.m68k

     

       
36
       
36
       
-
       
      ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;

     

       
36
       
36
       
+
       
      ++ lib.platforms.loongarch64;

     

       
37
       
37
       
 
       
  };

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  releaseInfo =

     

···

       
1
       
1
       
-
       
diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake

     

       
2
       
2
       
-
       
--- a/cmake/builtin-config-ix.cmake @llvm 15.0.6

     

       
3
       
3
       
-
       
+++ b/cmake/builtin-config-ix.cmake

     

       
4
       
4
       
-
       
@@ -46,7 +46,7 @@

     

       
5
       
5
       
-
       
 

     

       
6
       
6
       
-
       
 set(ARM64 aarch64)

     

       
7
       
7
       
-
       
-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)

     

       
8
       
8
       
-
       
+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)

     

       
9
       
9
       
-
       
 set(AVR avr)

     

       
10
       
10
       
-
       
 set(HEXAGON hexagon)

     

       
11
       
11
       
-
       
 set(X86 i386)

     

       
12
       
12
       
-
       
 set(X86_64 x86_64)

     

       
13
       
13
       
-
       
diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt

     

       
14
       
14
       
-
       
--- a/lib/builtins/CMakeLists.txt @llvm 15.0.6

     

       
15
       
15
       
-
       
+++ b/lib/builtins/CMakeLists.txt

     

       
16
       
16
       
-
       
@@ -565,6 +565,7 @@

     

       
17
       
17
       
-
       
 set(armv7_SOURCES ${arm_SOURCES})

     

       
18
       
18
       
-
       
 set(armv7s_SOURCES ${arm_SOURCES})

     

       
19
       
19
       
-
       
 set(armv7k_SOURCES ${arm_SOURCES})

     

       
20
       
20
       
-
       
+set(armv7l_SOURCES ${arm_SOURCES})

     

       
21
       
21
       
-
       
 set(arm64_SOURCES ${aarch64_SOURCES})

     

       
22
       
22
       
-
       
 

     

       
23
       
23
       
-
       
 # macho_embedded archs

     

       
24
       
24
       
-
       
@@ -734,7 +735,7 @@

     

       
25
       
25
       
-
       
   foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       
26
       
26
       
-
       
     if (CAN_TARGET_${arch})

     

       
27
       
27
       
-
       
       # For ARM archs, exclude any VFP builtins if VFP is not supported

     

       
28
       
28
       
-
       
-      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

       
29
       
29
       
-
       
+      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

       
30
       
30
       
-
       
         string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")

     

       
31
       
31
       
-
       
         check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)

     

       
32
       
32
       
-
       
         if(NOT COMPILER_RT_HAS_${arch}_VFP)

     

···

       
41
       
41
       
 
       
  # TODO: Make this account for GCC having libstdcxx, which will help

     

       
42
       
42
       
 
       
  # use clean up the `cmakeFlags` rats nest below.

     

       
43
       
43
       
 
       
  haveLibcxx = stdenv.cc.libcxx != null;

     

       
44
       
44
       
-
       
  isDarwinStatic =

     

       
45
       
45
       
-
       
    stdenv.hostPlatform.isDarwin

     

       
46
       
46
       
-
       
    && stdenv.hostPlatform.isStatic

     

       
47
       
47
       
-
       
    && lib.versionAtLeast release_version "16";

     

       
44
       
44
       
+
       
  isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;

     

       
48
       
45
       
 
       
  inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows;

     

       
49
       
46
       
 
       
  noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows;

     

       
50
       
47
       
 
       
in

     
···

       
97
       
94
       
 
       
    # See: https://github.com/NixOS/nixpkgs/pull/186575

     

       
98
       
95
       
 
       
    ./darwin-plistbuddy-workaround.patch

     

       
99
       
96
       
 
       
  ]

     

       
100
       
100
       
-
       
  ++

     

       
101
       
101
       
-
       
    lib.optional (lib.versions.major release_version == "15")

     

       
102
       
102
       
-
       
      # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893

     

       
103
       
103
       
-
       
      ./armv7l-15.patch

     

       
104
       
97
       
 
       
  ++ lib.optionals (lib.versionOlder release_version "18") [

     

       
105
       
98
       
 
       
    # Fix build on armv6l

     

       
106
       
99
       
 
       
    ./armv6-scudo-no-yield.patch

     
···

       
191
       
184
       
 
       
    (lib.cmakeFeature "COMPILER_RT_OS_DIR" "baremetal")

     

       
192
       
185
       
 
       
  ]

     

       
193
       
186
       
 
       
  ++ lib.optionals (stdenv.hostPlatform.isDarwin) (

     

       
194
       
194
       
-
       
    lib.optionals (lib.versionAtLeast release_version "16") [

     

       
187
       
187
       
+
       
    [

     

       
195
       
188
       
 
       
      (lib.cmakeFeature "CMAKE_LIPO" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo")

     

       
196
       
189
       
 
       
    ]

     

       
197
       
190
       
 
       
    ++ lib.optionals (!haveLibcxx) [

     
···

       
255
       
248
       
 
       
            --replace-fail 'find_program(CODESIGN codesign)' ""

     

       
256
       
249
       
 
       
        '';

     

       
257
       
250
       
 
       


     

       
258
       
258
       
-
       
  preConfigure =

     

       
259
       
259
       
-
       
    lib.optionalString (lib.versionOlder release_version "16" && !haveLibc) ''

     

       
260
       
260
       
-
       
      cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

     

       
261
       
261
       
-
       
    ''

     

       
262
       
262
       
-
       
    + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
263
       
263
       
-
       
      cmakeFlagsArray+=(

     

       
264
       
264
       
-
       
        "-DDARWIN_macosx_CACHED_SYSROOT=$SDKROOT"

     

       
265
       
265
       
-
       
        "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=$(jq -r .Version "$SDKROOT/SDKSettings.json")"

     

       
266
       
266
       
-
       
      )

     

       
267
       
267
       
-
       
    '';

     

       
251
       
251
       
+
       
  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
252
       
252
       
+
       
    cmakeFlagsArray+=(

     

       
253
       
253
       
+
       
      "-DDARWIN_macosx_CACHED_SYSROOT=$SDKROOT"

     

       
254
       
254
       
+
       
      "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=$(jq -r .Version "$SDKROOT/SDKSettings.json")"

     

       
255
       
255
       
+
       
    )

     

       
256
       
256
       
+
       
  '';

     

       
268
       
257
       
 
       


     

       
269
       
258
       
 
       
  # Hack around weird upstream RPATH bug

     

       
270
       
259
       
 
       
  postInstall =

     

···

       
115
       
115
       
 
       
    tools:

     

       
116
       
116
       
 
       
    let

     

       
117
       
117
       
 
       
      callPackage = newScope (tools // args // metadata);

     

       
118
       
118
       
-
       
      clangVersion =

     

       
119
       
119
       
-
       
        if (lib.versionOlder metadata.release_version "16") then

     

       
120
       
120
       
-
       
          metadata.release_version

     

       
121
       
121
       
-
       
        else

     

       
122
       
122
       
-
       
          lib.versions.major metadata.release_version;

     

       
118
       
118
       
+
       
      clangVersion = lib.versions.major metadata.release_version;

     

       
123
       
119
       
 
       
      mkExtraBuildCommands0 =

     

       
124
       
120
       
 
       
        cc:

     

       
125
       
121
       
 
       
        ''

     
···

       
401
       
397
       
 
       
      clangNoCompilerRt = tools.clangNoLibcNoRt;

     

       
402
       
398
       
 
       
      clangNoLibc = tools.clangNoLibcWithBasicRt;

     

       
403
       
399
       
 
       
      clangNoLibcxx = tools.clangWithLibcAndBasicRt;

     

       
404
       
404
       
-
       
    }

     

       
405
       
405
       
-
       
    // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "16") {

     

       
400
       
400
       
+
       


     

       
406
       
401
       
 
       
      mlir = callPackage ./mlir { };

     

       
407
       
402
       
 
       
    }

     

       
408
       
403
       
 
       
    // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {

     

       
409
       
404
       
 
       
      bolt = callPackage ./bolt {

     

       
410
       
405
       
 
       
      };

     

       
411
       
406
       
 
       
    }

     

       
412
       
412
       
-
       
    //

     

       
413
       
413
       
-
       
      lib.optionalAttrs

     

       
414
       
414
       
-
       
        (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "22")

     

       
415
       
415
       
-
       
        {

     

       
416
       
416
       
-
       
          libclc = callPackage ./libclc { };

     

       
417
       
417
       
-
       
        }

     

       
407
       
407
       
+
       
    // lib.optionalAttrs (lib.versionOlder metadata.release_version "22") {

     

       
408
       
408
       
+
       
      libclc = callPackage ./libclc { };

     

       
409
       
409
       
+
       
    }

     

       
418
       
410
       
 
       
    // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {

     

       
419
       
411
       
 
       
      flang = callPackage ./flang {

     

       
420
       
412
       
 
       
        mlir = tools.mlir;

     

···

       
64
       
64
       
 
       
    # https://github.com/llvm/llvm-project/issues/55245

     

       
65
       
65
       
 
       
    (lib.cmakeBool "LIBCXX_ENABLE_STATIC_ABI_LIBRARY" stdenv.hostPlatform.isWindows)

     

       
66
       
66
       
 
       
  ]

     

       
67
       
67
       
-
       
  ++ lib.optionals (cxxabi == null && lib.versionAtLeast release_version "16") [

     

       
68
       
68
       
-
       
    # Note: llvm < 16 doesn't support this flag (or it's broken); handled in postInstall instead.

     

       
67
       
67
       
+
       
  ++ lib.optionals (cxxabi == null) [

     

       
69
       
68
       
 
       
    # Include libc++abi symbols within libc++.a for static linking libc++;

     

       
70
       
69
       
 
       
    # dynamic linking includes them through libc++.so being a linker script

     

       
71
       
70
       
 
       
    # which includes both shared objects.

     
···

       
96
       
95
       
 
       
  ++ lib.optionals useLLVM [

     

       
97
       
96
       
 
       
    (lib.cmakeBool "LIBCXX_USE_COMPILER_RT" true)

     

       
98
       
97
       
 
       
  ]

     

       
99
       
99
       
-
       
  ++

     

       
100
       
100
       
-
       
    lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD && lib.versionAtLeast release_version "16")

     

       
101
       
101
       
-
       
      [

     

       
102
       
102
       
-
       
        (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")

     

       
103
       
103
       
-
       
      ]

     

       
98
       
98
       
+
       
  ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD) [

     

       
99
       
99
       
+
       
    (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")

     

       
100
       
100
       
+
       
  ]

     

       
104
       
101
       
 
       
  ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       
105
       
102
       
 
       
    (lib.cmakeBool "LIBCXX_ENABLE_THREADS" false)

     

       
106
       
103
       
 
       
    (lib.cmakeBool "LIBCXX_ENABLE_FILESYSTEM" false)

     
···

       
163
       
160
       
 
       
      patchShebangs utils/cat_files.py

     

       
164
       
161
       
 
       
    '';

     

       
165
       
162
       
 
       


     

       
166
       
166
       
-
       
    patches = lib.optionals (lib.versionOlder release_version "16") (

     

       
167
       
167
       
-
       
      lib.optional (lib.versions.major release_version == "15")

     

       
168
       
168
       
-
       
        # See:

     

       
169
       
169
       
-
       
        #   - https://reviews.llvm.org/D133566

     

       
170
       
170
       
-
       
        #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432

     

       
171
       
171
       
-
       
        # !!! Drop in LLVM 16+

     

       
172
       
172
       
-
       
        (

     

       
173
       
173
       
-
       
          fetchpatch {

     

       
174
       
174
       
-
       
            url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";

     

       
175
       
175
       
-
       
            hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";

     

       
176
       
176
       
-
       
          }

     

       
177
       
177
       
-
       
        )

     

       
178
       
178
       
-
       
      ++ [

     

       
179
       
179
       
-
       
        (substitute {

     

       
180
       
180
       
-
       
          src = ../libcxxabi/wasm.patch;

     

       
181
       
181
       
-
       
          substitutions = [

     

       
182
       
182
       
-
       
            "--replace-fail"

     

       
183
       
183
       
-
       
            "/cmake/"

     

       
184
       
184
       
-
       
            "/llvm/cmake/"

     

       
185
       
185
       
-
       
          ];

     

       
186
       
186
       
-
       
        })

     

       
187
       
187
       
-
       
      ]

     

       
188
       
188
       
-
       
      ++ lib.optional stdenv.hostPlatform.isMusl (substitute {

     

       
189
       
189
       
-
       
        src = ./libcxx-0001-musl-hacks.patch;

     

       
190
       
190
       
-
       
        substitutions = [

     

       
191
       
191
       
-
       
          "--replace-fail"

     

       
192
       
192
       
-
       
          "/include/"

     

       
193
       
193
       
-
       
          "/libcxx/include/"

     

       
194
       
194
       
-
       
        ];

     

       
195
       
195
       
-
       
      })

     

       
196
       
196
       
-
       
    );

     

       
163
       
163
       
+
       
    # TODO: Remove on `staging`.

     

       
164
       
164
       
+
       
    patches = [ ];

     

       
197
       
165
       
 
       


     

       
198
       
166
       
 
       
    nativeBuildInputs = [

     

       
199
       
167
       
 
       
      cmake

     
···

       
219
       
187
       
 
       
        lndir ${lib.getLib cxxabi}/lib $out/lib

     

       
220
       
188
       
 
       
        libcxxabi=$out/lib/lib${cxxabi.libName}.a

     

       
221
       
189
       
 
       
      ''

     

       
222
       
222
       
-
       
      # LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON doesn't work for LLVM < 16 or

     

       
190
       
190
       
+
       
      # LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON doesn't work for

     

       
223
       
191
       
 
       
      # external cxxabi libraries so merge libc++abi.a into libc++.a ourselves.

     

       
224
       
192
       
 
       


     

       
225
       
193
       
 
       
      # GNU binutils emits objects in LIFO order in MRI scripts so after the merge

     

       
226
       
194
       
 
       
      # the objects are in reversed order so a second MRI script is required so the

     

       
227
       
195
       
 
       
      # objects in the archive are listed in proper order (libc++.a, libc++abi.a)

     

       
228
       
228
       
-
       
      + lib.optionalString (cxxabi != null || lib.versionOlder release_version "16") ''

     

       
196
       
196
       
+
       
      + lib.optionalString (cxxabi != null) ''

     

       
229
       
197
       
 
       
        libcxxabi=''${libcxxabi-$out/lib/libc++abi.a}

     

       
230
       
198
       
 
       
        if [[ -f $out/lib/libc++.a && -e $libcxxabi ]]; then

     

       
231
       
199
       
 
       
          $AR -M <<MRI

     
···

       
264
       
232
       
 
       
    };

     

       
265
       
233
       
 
       
  }

     

       
266
       
234
       
 
       
  // (

     

       
267
       
267
       
-
       
    if (lib.versionOlder release_version "16" || lib.versionAtLeast release_version "17") then

     

       
235
       
235
       
+
       
    if lib.versionAtLeast release_version "17" then

     

       
268
       
236
       
 
       
      {

     

       
269
       
237
       
 
       
        postPatch = ''

     

       
270
       
238
       
 
       
          cd runtimes

     

···

       
1
       
1
       
-
       
From 1c936d7fda3275265e37f93697232a1ed652390f Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Will Dietz <w@wdtz.org>

     

       
3
       
3
       
-
       
Date: Sat, 9 Jul 2016 19:22:54 -0500

     

       
4
       
4
       
-
       
Subject: [PATCH] musl fixes/hacks

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
Conflicts:

     

       
7
       
7
       
-
       


     

       
8
       
8
       
-
       
	include/__config

     

       
9
       
9
       
-
       
	include/locale

     

       
10
       
10
       
-
       
	src/locale.cpp

     

       
11
       
11
       
-
       
---

     

       
12
       
12
       
-
       
 include/locale |    4 ++--

     

       
13
       
13
       
-
       
 1 files changed, 2 insertions(+), 2 deletions(-)

     

       
14
       
14
       
-
       


     

       
15
       
15
       
-
       
diff --git a/include/locale b/include/locale

     

       
16
       
16
       
-
       
index 3d804e8..9b01f5b 100644

     

       
17
       
17
       
-
       
--- a/include/locale

     

       
18
       
18
       
-
       
+++ b/include/locale

     

       
19
       
19
       
-
       
@@ -695,7 +695,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,

     

       
20
       
20
       
-
       
         typename remove_reference<decltype(errno)>::type __save_errno = errno;

     

       
21
       
21
       
-
       
         errno = 0;

     

       
22
       
22
       
-
       
         char *__p2;

     

       
23
       
23
       
-
       
-        long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);

     

       
24
       
24
       
-
       
+        long long __ll = strtoll(__a, &__p2, __base);

     

       
25
       
25
       
-
       
         typename remove_reference<decltype(errno)>::type __current_errno = errno;

     

       
26
       
26
       
-
       
         if (__current_errno == 0)

     

       
27
       
27
       
-
       
             errno = __save_errno;

     

       
28
       
28
       
-
       
@@ -735,7 +735,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,

     

       
29
       
29
       
-
       
         typename remove_reference<decltype(errno)>::type __save_errno = errno;

     

       
30
       
30
       
-
       
         errno = 0;

     

       
31
       
31
       
-
       
         char *__p2;

     

       
32
       
32
       
-
       
-        unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);

     

       
33
       
33
       
-
       
+        unsigned long long __ll = strtoull(__a, &__p2, __base);

     

       
34
       
34
       
-
       
         typename remove_reference<decltype(errno)>::type __current_errno = errno;

     

       
35
       
35
       
-
       
         if (__current_errno == 0)

     

       
36
       
36
       
-
       
             errno = __save_errno;

     

       
37
       
37
       
-
       
-- 

     

       
38
       
38
       
-
       
1.7.1

     

       
39
       
39
       
-
       


     

···

       
1
       
1
       
-
       
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake

     

       
2
       
2
       
-
       
index 15497d405e0..33f7f18193a 100644

     

       
3
       
3
       
-
       
--- a/cmake/modules/HandleLLVMOptions.cmake

     

       
4
       
4
       
-
       
+++ b/cmake/modules/HandleLLVMOptions.cmake

     

       
5
       
5
       
-
       
@@ -127,7 +127,10 @@ else(WIN32)

     

       
6
       
6
       
-
       
       set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)

     

       
7
       
7
       
-
       
     endif()

     

       
8
       
8
       
-
       
   else(FUCHSIA OR UNIX)

     

       
9
       
9
       
-
       
-    MESSAGE(SEND_ERROR "Unable to determine platform")

     

       
10
       
10
       
-
       
+    if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")

     

       
11
       
11
       
-
       
+    else()

     

       
12
       
12
       
-
       
+      MESSAGE(SEND_ERROR "Unable to determine platform")

     

       
13
       
13
       
-
       
+    endif()

     

       
14
       
14
       
-
       
   endif(FUCHSIA OR UNIX)

     

       
15
       
15
       
-
       
 endif(WIN32)

     

       
16
       
16
       
-
       
 

     

···

       
38
       
38
       
 
       
  patches = [

     

       
39
       
39
       
 
       
    (getVersionFile "lld/gnu-install-dirs.patch")

     

       
40
       
40
       
 
       
  ]

     

       
41
       
41
       
-
       
  ++ lib.optional (lib.versionAtLeast release_version "16" && lib.versionOlder release_version "18") (

     

       
42
       
42
       
-
       
    getVersionFile "lld/add-table-base.patch"

     

       
43
       
43
       
-
       
  )

     

       
41
       
41
       
+
       
  ++ lib.optional (lib.versionOlder release_version "18") (getVersionFile "lld/add-table-base.patch")

     

       
44
       
42
       
 
       
  ++ lib.optional (lib.versions.major release_version == "18") (

     

       
45
       
43
       
 
       
    # https://github.com/llvm/llvm-project/pull/97122

     

       
46
       
44
       
 
       
    fetchpatch {

     

···

       
78
       
78
       
 
       
          }).overrideAttrs

     

       
79
       
79
       
 
       
            (_: _: { name = "resource-dir.patch"; });

     

       
80
       
80
       
 
       
      in

     

       
81
       
81
       
-
       
      lib.optionals (lib.versionOlder release_version "16") [

     

       
82
       
82
       
-
       
        # Fixes for SWIG 4

     

       
83
       
83
       
-
       
        (fetchpatch2 {

     

       
84
       
84
       
-
       
          url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";

     

       
85
       
85
       
-
       
          stripLen = 1;

     

       
86
       
86
       
-
       
          hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";

     

       
87
       
87
       
-
       
        })

     

       
88
       
88
       
-
       
        (fetchpatch2 {

     

       
89
       
89
       
-
       
          url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";

     

       
90
       
90
       
-
       
          stripLen = 1;

     

       
91
       
91
       
-
       
          hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";

     

       
92
       
92
       
-
       
        })

     

       
93
       
93
       
-
       


     

       
94
       
94
       
-
       
        # FIXME: do we need this after 15?

     

       
95
       
95
       
-
       
        (getVersionFile "lldb/procfs.patch")

     

       
96
       
96
       
-
       
      ]

     

       
97
       
97
       
-
       
      ++ lib.optional (lib.versionOlder release_version "18") (fetchpatch {

     

       
81
       
81
       
+
       
      lib.optional (lib.versionOlder release_version "18") (fetchpatch {

     

       
98
       
82
       
 
       
        name = "libcxx-19-char_traits.patch";

     

       
99
       
83
       
 
       
        url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch";

     

       
100
       
84
       
 
       
        stripLen = 1;

     
···

       
140
       
124
       
 
       
      libedit

     

       
141
       
125
       
 
       
      libxml2

     

       
142
       
126
       
 
       
      libllvm

     

       
143
       
143
       
-
       
    ]

     

       
144
       
144
       
-
       
    ++ lib.optionals (lib.versionAtLeast release_version "16") [

     

       
145
       
127
       
 
       
      # Starting with LLVM 16, the resource dir patch is no longer enough to get

     

       
146
       
128
       
 
       
      # libclang into the rpath of the lldb executables. By putting it into

     

       
147
       
129
       
 
       
      # buildInputs cc-wrapper will set up rpath correctly for us.

     

···

       
178
       
178
       
 
       
              stripLen = 1;

     

       
179
       
179
       
 
       
            }

     

       
180
       
180
       
 
       
          )

     

       
181
       
181
       
-
       
      ++ lib.optionals (lib.versionOlder release_version "16") [

     

       
182
       
182
       
-
       
        # Fix musl build.

     

       
183
       
183
       
-
       
        (fetchpatch {

     

       
184
       
184
       
-
       
          url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch";

     

       
185
       
185
       
-
       
          relative = "llvm";

     

       
186
       
186
       
-
       
          hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";

     

       
187
       
187
       
-
       
        })

     

       
188
       
188
       
-
       
        # Fix for Python 3.13

     

       
189
       
189
       
-
       
        (getVersionFile "llvm/no-pipes.patch")

     

       
190
       
190
       
-
       
      ]

     

       
191
       
181
       
 
       
      ++ lib.optionals (lib.versionOlder (lib.versions.major release_version) "17") [

     

       
192
       
182
       
 
       
        # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)

     

       
193
       
183
       
 
       
        # See also: https://github.com/numba/numba/issues/9109

     
···

       
308
       
298
       
 
       
        +

     

       
309
       
299
       
 
       
          # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)

     

       
310
       
300
       
 
       
          # and thus fails under the sandbox:

     

       
311
       
311
       
-
       
          (

     

       
312
       
312
       
-
       
            if lib.versionAtLeast release_version "16" then

     

       
313
       
313
       
-
       
              ''

     

       
314
       
314
       
-
       
                substituteInPlace unittests/TargetParser/Host.cpp \

     

       
315
       
315
       
-
       
                  --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       
316
       
316
       
-
       
              ''

     

       
317
       
317
       
-
       
            else

     

       
318
       
318
       
-
       
              ''

     

       
319
       
319
       
-
       
                substituteInPlace unittests/Support/Host.cpp \

     

       
320
       
320
       
-
       
                  --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       
321
       
321
       
-
       
              ''

     

       
322
       
322
       
-
       
          )

     

       
301
       
301
       
+
       
          ''

     

       
302
       
302
       
+
       
            substituteInPlace unittests/TargetParser/Host.cpp \

     

       
303
       
303
       
+
       
              --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       
304
       
304
       
+
       
          ''

     

       
323
       
305
       
 
       
        +

     

       
324
       
306
       
 
       
          # This test tries to call the intrinsics `@llvm.roundeven.f32` and

     

       
325
       
307
       
 
       
          # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`

     
···

       
331
       
313
       
 
       
          #

     

       
332
       
314
       
 
       
          # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it

     

       
333
       
315
       
 
       
          # pass there?

     

       
334
       
334
       
-
       
          optionalString (lib.versionAtLeast release_version "16") ''

     

       
316
       
316
       
+
       
          ''

     

       
335
       
317
       
 
       
            substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \

     

       
336
       
318
       
 
       
              --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \

     

       
337
       
319
       
 
       
              --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""

     
···

       
346
       
328
       
 
       
      +

     

       
347
       
329
       
 
       
        # dup of above patch with different conditions

     

       
348
       
330
       
 
       
        optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) (

     

       
349
       
349
       
-
       
          optionalString (lib.versionOlder release_version "16") ''

     

       
350
       
350
       
-
       
            substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \

     

       
351
       
351
       
-
       
              --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \

     

       
352
       
352
       
-
       
              --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""

     

       
353
       
353
       
-
       


     

       
354
       
354
       
-
       
          ''

     

       
355
       
355
       
-
       
          +

     

       
356
       
356
       
-
       
            # fails when run in sandbox

     

       
357
       
357
       
-
       
            (

     

       
358
       
358
       
-
       
              (optionalString (lib.versionAtLeast release_version "18") ''

     

       
359
       
359
       
-
       
                substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       
360
       
360
       
-
       
                  --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       
361
       
361
       
-
       
              '')

     

       
362
       
362
       
-
       
              +

     

       
363
       
363
       
-
       
                # This test fails on darwin x86_64 because `sw_vers` reports a different

     

       
364
       
364
       
-
       
                # macOS version than what LLVM finds by reading

     

       
365
       
365
       
-
       
                # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into

     

       
366
       
366
       
-
       
                # the sandbox on macOS).

     

       
367
       
367
       
-
       
                #

     

       
368
       
368
       
-
       
                # The `sw_vers` provided by nixpkgs reports the macOS version associated

     

       
369
       
369
       
-
       
                # with the `CoreFoundation` framework with which it was built. Because

     

       
370
       
370
       
-
       
                # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what

     

       
371
       
371
       
-
       
                # `sw_vers` reports is not guaranteed to match the macOS version of the host

     

       
372
       
372
       
-
       
                # that's building this derivation.

     

       
373
       
373
       
-
       
                #

     

       
374
       
374
       
-
       
                # Astute readers will note that we only _patch_ this test on aarch64-darwin

     

       
375
       
375
       
-
       
                # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright.

     

       
376
       
376
       
-
       
                # So why does this test pass on aarch64?

     

       
377
       
377
       
-
       
                #

     

       
378
       
378
       
-
       
                # Well, it seems that `sw_vers` on aarch64 actually links against the _host_

     

       
379
       
379
       
-
       
                # CoreFoundation framework instead of the nixpkgs provided one.

     

       
380
       
380
       
-
       
                #

     

       
381
       
381
       
-
       
                # Not entirely sure what the right fix is here. I'm assuming aarch64

     

       
382
       
382
       
-
       
                # `sw_vers` doesn't intentionally link against the host `CoreFoundation`

     

       
383
       
383
       
-
       
                # (still digging into how this ends up happening, will follow up) but that

     

       
384
       
384
       
-
       
                # aside I think the more pertinent question is: should we be patching LLVM's

     

       
385
       
385
       
-
       
                # macOS version detection logic to use `sw_vers` instead of reading host

     

       
386
       
386
       
-
       
                # paths? This *is* a way in which details about builder machines can creep

     

       
387
       
387
       
-
       
                # into the artifacts that are produced, affecting reproducibility, but it's

     

       
388
       
388
       
-
       
                # not clear to me when/where/for what this even gets used in LLVM.

     

       
389
       
389
       
-
       
                #

     

       
390
       
390
       
-
       
                # TODO(@rrbutani): fix/follow-up

     

       
391
       
391
       
-
       
                (

     

       
392
       
392
       
-
       
                  if lib.versionAtLeast release_version "16" then

     

       
393
       
393
       
-
       
                    ''

     

       
394
       
394
       
-
       
                      substituteInPlace unittests/TargetParser/Host.cpp \

     

       
395
       
395
       
-
       
                        --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       
396
       
396
       
-
       
                    ''

     

       
397
       
397
       
-
       
                  else

     

       
398
       
398
       
-
       
                    ''

     

       
399
       
399
       
-
       
                      substituteInPlace unittests/Support/Host.cpp \

     

       
400
       
400
       
-
       
                        --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       
401
       
401
       
-
       
                    ''

     

       
402
       
402
       
-
       
                )

     

       
403
       
403
       
-
       
              +

     

       
404
       
404
       
-
       
                # This test fails with a `dysmutil` crash; have not yet dug into what's

     

       
405
       
405
       
-
       
                # going on here (TODO(@rrbutani)).

     

       
406
       
406
       
-
       
                lib.optionalString (lib.versionOlder release_version "19") ''

     

       
407
       
407
       
-
       
                  rm test/tools/dsymutil/ARM/obfuscated.test

     

       
408
       
408
       
-
       
                ''

     

       
409
       
409
       
-
       
            )

     

       
331
       
331
       
+
       
          # fails when run in sandbox

     

       
332
       
332
       
+
       
          (

     

       
333
       
333
       
+
       
            (optionalString (lib.versionAtLeast release_version "18") ''

     

       
334
       
334
       
+
       
              substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       
335
       
335
       
+
       
                --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       
336
       
336
       
+
       
            '')

     

       
337
       
337
       
+
       
            +

     

       
338
       
338
       
+
       
              # This test fails on darwin x86_64 because `sw_vers` reports a different

     

       
339
       
339
       
+
       
              # macOS version than what LLVM finds by reading

     

       
340
       
340
       
+
       
              # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into

     

       
341
       
341
       
+
       
              # the sandbox on macOS).

     

       
342
       
342
       
+
       
              #

     

       
343
       
343
       
+
       
              # The `sw_vers` provided by nixpkgs reports the macOS version associated

     

       
344
       
344
       
+
       
              # with the `CoreFoundation` framework with which it was built. Because

     

       
345
       
345
       
+
       
              # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what

     

       
346
       
346
       
+
       
              # `sw_vers` reports is not guaranteed to match the macOS version of the host

     

       
347
       
347
       
+
       
              # that's building this derivation.

     

       
348
       
348
       
+
       
              #

     

       
349
       
349
       
+
       
              # Astute readers will note that we only _patch_ this test on aarch64-darwin

     

       
350
       
350
       
+
       
              # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright.

     

       
351
       
351
       
+
       
              # So why does this test pass on aarch64?

     

       
352
       
352
       
+
       
              #

     

       
353
       
353
       
+
       
              # Well, it seems that `sw_vers` on aarch64 actually links against the _host_

     

       
354
       
354
       
+
       
              # CoreFoundation framework instead of the nixpkgs provided one.

     

       
355
       
355
       
+
       
              #

     

       
356
       
356
       
+
       
              # Not entirely sure what the right fix is here. I'm assuming aarch64

     

       
357
       
357
       
+
       
              # `sw_vers` doesn't intentionally link against the host `CoreFoundation`

     

       
358
       
358
       
+
       
              # (still digging into how this ends up happening, will follow up) but that

     

       
359
       
359
       
+
       
              # aside I think the more pertinent question is: should we be patching LLVM's

     

       
360
       
360
       
+
       
              # macOS version detection logic to use `sw_vers` instead of reading host

     

       
361
       
361
       
+
       
              # paths? This *is* a way in which details about builder machines can creep

     

       
362
       
362
       
+
       
              # into the artifacts that are produced, affecting reproducibility, but it's

     

       
363
       
363
       
+
       
              # not clear to me when/where/for what this even gets used in LLVM.

     

       
364
       
364
       
+
       
              #

     

       
365
       
365
       
+
       
              # TODO(@rrbutani): fix/follow-up

     

       
366
       
366
       
+
       
              ''

     

       
367
       
367
       
+
       
                substituteInPlace unittests/TargetParser/Host.cpp \

     

       
368
       
368
       
+
       
                  --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       
369
       
369
       
+
       
              ''

     

       
370
       
370
       
+
       
            +

     

       
371
       
371
       
+
       
              # This test fails with a `dysmutil` crash; have not yet dug into what's

     

       
372
       
372
       
+
       
              # going on here (TODO(@rrbutani)).

     

       
373
       
373
       
+
       
              lib.optionalString (lib.versionOlder release_version "19") ''

     

       
374
       
374
       
+
       
                rm test/tools/dsymutil/ARM/obfuscated.test

     

       
375
       
375
       
+
       
              ''

     

       
376
       
376
       
+
       
          )

     

       
410
       
377
       
 
       
        )

     

       
411
       
378
       
 
       
      +

     

       
412
       
379
       
 
       
        # FileSystem permissions tests fail with various special bits

     
···

       
422
       
389
       
 
       
      +

     

       
423
       
390
       
 
       
        # Fails in the presence of anti-virus software or other intrusion-detection software that

     

       
424
       
391
       
 
       
        # modifies the atime when run. See #284056.

     

       
425
       
425
       
-
       
        lib.optionalString (lib.versionAtLeast release_version "16") (

     

       
426
       
426
       
-
       
          ''

     

       
427
       
427
       
-
       
            rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test

     

       
428
       
428
       
-
       
          ''

     

       
429
       
429
       
-
       
          + lib.optionalString (lib.versionOlder release_version "17") ''

     

       
430
       
430
       
-
       


     

       
431
       
431
       
-
       
          ''

     

       
432
       
432
       
-
       
        )

     

       
392
       
392
       
+
       
        ''

     

       
393
       
393
       
+
       
          rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test

     

       
394
       
394
       
+
       
        ''

     

       
433
       
395
       
 
       
      +

     

       
434
       
396
       
 
       
        # timing-based tests are trouble

     

       
435
       
397
       
 
       
        lib.optionalString (lib.versionOlder release_version "17") ''

     

       
398
       
398
       
+
       


     

       
436
       
399
       
 
       
          rm utils/lit/tests/googletest-timeout.py

     

       
437
       
400
       
 
       
        ''

     

       
438
       
401
       
 
       
      +