commit 2dac87bbdecffa25f8d9a6c3a3e9c695a674e6a0 · pyrox.dev/nixpkgs

+1 -1

doc/release-notes/rl-2511.section.md

···

       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, 14, 15, and 16 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       29
       29
       +
       - LLVM 12, 13, 14, 15, 16, and 17 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

-39

pkgs/development/compilers/llvm/17/clang/aarch64-tblgen.patch

···

       1
       1
       -
       diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def

     

       2
       2
       -
       index ef0dad0f2..afd101b00 100644

     

       3
       3
       -
       --- a/include/clang/Basic/TokenKinds.def

     

       4
       4
       -
       +++ b/include/clang/Basic/TokenKinds.def

     

       5
       5
       -
       @@ -753,7 +753,7 @@ KEYWORD(__builtin_sycl_unique_stable_name, KEYSYCL)

     

       6
       6
       -
       

     

       7
       7
       -
        // Keywords defined by Attr.td.

     

       8
       8
       -
        #ifndef KEYWORD_ATTRIBUTE

     

       9
       9
       -
       -#define KEYWORD_ATTRIBUTE(X) KEYWORD(X, KEYALL)

     

       10
       10
       -
       +#define KEYWORD_ATTRIBUTE(X, EMPTY) KEYWORD(EMPTY ## X, KEYALL)

     

       11
       11
       -
        #endif

     

       12
       12
       -
        #include "clang/Basic/AttrTokenKinds.inc"

     

       13
       13
       -
       

     

       14
       14
       -
       diff --git a/include/clang/Basic/TokenKinds.h b/include/clang/Basic/TokenKinds.h

     

       15
       15
       -
       index e4857405b..ff117bd5a 100644

     

       16
       16
       -
       --- a/include/clang/Basic/TokenKinds.h

     

       17
       17
       -
       +++ b/include/clang/Basic/TokenKinds.h

     

       18
       18
       -
       @@ -109,7 +109,7 @@ bool isPragmaAnnotation(TokenKind K);

     

       19
       19
       -
       

     

       20
       20
       -
        inline constexpr bool isRegularKeywordAttribute(TokenKind K) {

     

       21
       21
       -
          return (false

     

       22
       22
       -
       -#define KEYWORD_ATTRIBUTE(X) || (K == tok::kw_##X)

     

       23
       23
       -
       +#define KEYWORD_ATTRIBUTE(X, ...) || (K == tok::kw_##X)

     

       24
       24
       -
        #include "clang/Basic/AttrTokenKinds.inc"

     

       25
       25
       -
          );

     

       26
       26
       -
        }

     

       27
       27
       -
       diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp

     

       28
       28
       -
       index b5813c6ab..79db17501 100644

     

       29
       29
       -
       --- a/utils/TableGen/ClangAttrEmitter.cpp

     

       30
       30
       -
       +++ b/utils/TableGen/ClangAttrEmitter.cpp

     

       31
       31
       -
       @@ -3430,7 +3430,7 @@ void EmitClangAttrTokenKinds(RecordKeeper &Records, raw_ostream &OS) {

     

       32
       32
       -
                             "RegularKeyword attributes with arguments are not "

     

       33
       33
       -
                             "yet supported");

     

       34
       34
       -
                OS << "KEYWORD_ATTRIBUTE("

     

       35
       35
       -
       -           << S.getSpellingRecord().getValueAsString("Name") << ")\n";

     

       36
       36
       -
       +           << S.getSpellingRecord().getValueAsString("Name") << ", )\n";

     

       37
       37
       -
              }

     

       38
       38
       -
          OS << "#undef KEYWORD_ATTRIBUTE\n";

     

       39
       39
       -
        }

-98

pkgs/development/compilers/llvm/17/clang/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index f7936d72e088..a362fa49b534 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwritting

     

       10
       10
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       11
       11
       -
       +  # LLVM_CONFIG.

     

       12
       12
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

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

     

       14
       14
       -
       +    # path is removed.

     

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

     

       16
       16
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

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

     

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

     

       19
       19
       -
       +    set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

     

       20
       20
       -
       +    set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

     

       21
       21
       -
       +  else()

     

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

     

       23
       23
       -
       +  endif()

     

       24
       24
       -
       +

     

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

     

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

     

       27
       27
       -
          set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

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

     

       29
       29
       -
       index 75b0080f6715..c895b884cd27 100644

     

       30
       30
       -
       --- a/cmake/modules/AddClang.cmake

     

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

     

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

     

       33
       33
       -
                install(TARGETS ${lib}

     

       34
       34
       -
                  COMPONENT ${lib}

     

       35
       35
       -
                  ${export_to_clangtargets}

     

       36
       36
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       37
       37
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

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

     

       41
       41
       -
        

     

       42
       42
       -
                if (NOT LLVM_ENABLE_IDE)

     

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

     

       44
       44
       -
       index f2b0c5cddcbb..52f37fc368ce 100644

     

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

     

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

     

       47
       47
       -
       @@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files})

     

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

     

       49
       49
       -
        

     

       50
       50
       -
        get_clang_resource_dir(header_install_dir SUBDIR include)

     

       51
       51
       -
       +set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${CLANG_VERSION_MAJOR}/include)

     

       52
       52
       -
        

     

       53
       53
       -
        #############################################################

     

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

     

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

     

       56
       56
       -
       index 4f23065a2472..6a0f55991e24 100644

     

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

     

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

     

       59
       59
       -
       @@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

     

       60
       60
       -
                  COMPONENT

     

       61
       61
       -
                    libclang-python-bindings

     

       62
       62
       -
                  DESTINATION

     

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

     

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

     

       65
       65
       -
        endforeach()

     

       66
       66
       -
        if(NOT LLVM_ENABLE_IDE)

     

       67
       67
       -
          add_custom_target(libclang-python-bindings)

     

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

     

       69
       69
       -
       index 3aca22c0b0a8..3115353e3fe3 100644

     

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

     

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

     

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

     

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

     

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

     

       75
       75
       -
          install(FILES lib/libscanbuild/${lib}

     

       76
       76
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

     

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

     

       78
       78
       -
                  COMPONENT scan-build-py)

     

       79
       79
       -
        endforeach()

     

       80
       80
       -
        

     

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

     

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

     

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

     

       84
       84
       -
          install(FILES lib/libscanbuild/resources/${resource}

     

       85
       85
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

     

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

     

       87
       87
       -
                  COMPONENT scan-build-py)

     

       88
       88
       -
        endforeach()

     

       89
       89
       -
        

     

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

     

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

     

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

     

       93
       93
       -
          install(FILES lib/libear/${lib}

     

       94
       94
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

     

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

     

       96
       96
       -
                  COMPONENT scan-build-py)

     

       97
       97
       -
        endforeach()

     

       98
       98
       -

-29

pkgs/development/compilers/llvm/17/clang/purity.patch

···

       1
       1
       -
       From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Thu, 18 May 2017 11:56:12 -0500

     

       4
       4
       -
       Subject: [PATCH] "purity" patch for 5.0

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/Driver/ToolChains/Gnu.cpp | 7 -------

     

       8
       8
       -
        1 file changed, 7 deletions(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

     

       11
       11
       -
       index fe3c0191bb..c6a482bece 100644

     

       12
       12
       -
       --- a/lib/Driver/ToolChains/Gnu.cpp

     

       13
       13
       -
       +++ b/lib/Driver/ToolChains/Gnu.cpp

     

       14
       14
       -
       @@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

     

       15
       15
       -
          } else {

     

       16
       16
       -
            if (Args.hasArg(options::OPT_rdynamic))

     

       17
       17
       -
              CmdArgs.push_back("-export-dynamic");

     

       18
       18
       -
       

     

       19
       19
       -
       -    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&

     

       20
       20
       -
       -        !Args.hasArg(options::OPT_r)) {

     

       21
       21
       -
       -      CmdArgs.push_back("-dynamic-linker");

     

       22
       22
       -
       -      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

     

       23
       23
       -
       -                                           ToolChain.getDynamicLinker(Args)));

     

       24
       24
       -
       -    }

     

       25
       25
       -
          }

     

       26
       26
       -
        

     

       27
       27
       -
          CmdArgs.push_back("-o");

     

       28
       28
       -
       -- 

     

       29
       29
       -
       2.11.0

pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch

pkgs/development/compilers/llvm/17/compiler-rt/armv6-scudo-libatomic.patch pkgs/development/compilers/llvm/18/compiler-rt/armv6-scudo-libatomic.patch

-71

pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch

···

       1
       1
       -
       diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp

     

       2
       2
       -
       --- a/lib/sanitizer_common/sanitizer_mac.cpp

     

       3
       3
       -
       +++ b/lib/sanitizer_common/sanitizer_mac.cpp

     

       4
       4
       -
       @@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {

     

       5
       5
       -
        // Offset example:

     

       6
       6
       -
        // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4

     

       7
       7
       -
        constexpr u16 GetOSMajorKernelOffset() {

     

       8
       8
       -
       -  if (TARGET_OS_OSX) return 4;

     

       9
       9
       -
       -  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;

     

       10
       10
       -
       -  if (TARGET_OS_WATCH) return 13;

     

       11
       11
       -
       +#if TARGET_OS_OSX

     

       12
       12
       -
       +  return 4;

     

       13
       13
       -
       +#endif

     

       14
       14
       -
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       15
       15
       -
       +  return 6;

     

       16
       16
       -
       +#endif

     

       17
       17
       -
       +#if TARGET_OS_WATCH

     

       18
       18
       -
       +  return 13;

     

       19
       19
       -
       +#endif

     

       20
       20
       -
        }

     

       21
       21
       -
        

     

       22
       22
       -
        using VersStr = char[64];

     

       23
       23
       -
       @@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {

     

       24
       24
       -
          u16 os_major = kernel_major - offset;

     

       25
       25
       -
        

     

       26
       26
       -
          const char *format = "%d.0";

     

       27
       27
       -
       -  if (TARGET_OS_OSX) {

     

       28
       28
       -
       -    if (os_major >= 16) {  // macOS 11+

     

       29
       29
       -
       -      os_major -= 5;

     

       30
       30
       -
       -    } else {  // macOS 10.15 and below

     

       31
       31
       -
       -      format = "10.%d";

     

       32
       32
       -
       -    }

     

       33
       33
       -
       +#if TARGET_OS_OSX

     

       34
       34
       -
       +  if (os_major >= 16) {  // macOS 11+

     

       35
       35
       -
       +    os_major -= 5;

     

       36
       36
       -
       +  } else {  // macOS 10.15 and below

     

       37
       37
       -
       +    format = "10.%d";

     

       38
       38
       -
          }

     

       39
       39
       -
       +#endif

     

       40
       40
       -
          return internal_snprintf(vers, sizeof(VersStr), format, os_major);

     

       41
       41
       -
        }

     

       42
       42
       -
        

     

       43
       43
       -
       @@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {

     

       44
       44
       -
        // Aligned versions example:

     

       45
       45
       -
        // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6

     

       46
       46
       -
        static void MapToMacos(u16 *major, u16 *minor) {

     

       47
       47
       -
       -  if (TARGET_OS_OSX)

     

       48
       48
       -
       -    return;

     

       49
       49
       -
       -

     

       50
       50
       -
       -  if (TARGET_OS_IOS || TARGET_OS_TV)

     

       51
       51
       -
       +#if !TARGET_OS_OSX

     

       52
       52
       -
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       53
       53
       -
            *major += 2;

     

       54
       54
       -
       -  else if (TARGET_OS_WATCH)

     

       55
       55
       -
       +#elif TARGET_OS_WATCH

     

       56
       56
       -
            *major += 9;

     

       57
       57
       -
       -  else

     

       58
       58
       -
       +#else

     

       59
       59
       -
            UNREACHABLE("unsupported platform");

     

       60
       60
       -
       +#endif

     

       61
       61
       -
        

     

       62
       62
       -
          if (*major >= 16) {  // macOS 11+

     

       63
       63
       -
            *major -= 5;

     

       64
       64
       -
       @@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {

     

       65
       65
       -
            *minor = *major;

     

       66
       66
       -
            *major = 10;

     

       67
       67
       -
          }

     

       68
       68
       -
       +#endif

     

       69
       69
       -
        }

     

       70
       70
       -
        

     

       71
       71
       -
        static MacosVersion GetMacosAlignedVersionInternal() {

-20

pkgs/development/compilers/llvm/17/compiler-rt/gnu-install-dirs.patch

···

       1
       1
       -
       diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake

     

       2
       2
       -
       index 8a6219568b3f..30ee68a47ccf 100644

     

       3
       3
       -
       --- a/cmake/base-config-ix.cmake

     

       4
       4
       -
       +++ b/cmake/base-config-ix.cmake

     

       5
       5
       -
       @@ -100,13 +100,13 @@ endif()

     

       6
       6
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       7
       7
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

       8
       8
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib)

     

       9
       9
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)

     

       10
       10
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")

     

       11
       11
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

       12
       12
       -
            "Path where built compiler-rt libraries should be installed.")

     

       13
       13
       -
        else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       14
       14
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

       15
       15
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})

     

       16
       16
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")

     

       17
       17
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")

     

       18
       18
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

       19
       19
       -
            "Path where built compiler-rt libraries should be installed.")

     

       20
       20
       -
        endif()

pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch

pkgs/development/compilers/llvm/17/libclc/gnu-install-dirs.patch pkgs/development/compilers/llvm/18/libclc/gnu-install-dirs.patch

-190

pkgs/development/compilers/llvm/17/lld/add-table-base.patch

···

       1
       1
       -
       From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Sam Clegg <sbc@chromium.org>

     

       3
       3
       -
       Date: Fri, 25 Aug 2023 13:56:16 -0700

     

       4
       4
       -
       Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting

     

       5
       5
       -
       

     

       6
       6
       -
       This is similar to `--global-base` but determines where to place the

     

       7
       7
       -
       table segments rather than that data segments.

     

       8
       8
       -
       

     

       9
       9
       -
       See https://github.com/emscripten-core/emscripten/issues/20097

     

       10
       10
       -
       

     

       11
       11
       -
       Differential Revision: https://reviews.llvm.org/D158892

     

       12
       12
       -
       ---

     

       13
       13
       -
        test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++

     

       14
       14
       -
        wasm/Driver.cpp        | 19 ++++++++--

     

       15
       15
       -
        wasm/Options.td        |  5 ++-

     

       16
       16
       -
        wasm/Writer.cpp        |  8 -----

     

       17
       17
       -
        4 files changed, 93 insertions(+), 11 deletions(-)

     

       18
       18
       -
        create mode 100644 test/wasm/table-base.s

     

       19
       19
       -
       

     

       20
       20
       -
       diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s

     

       21
       21
       -
       new file mode 100644

     

       22
       22
       -
       index 000000000000000..56fff414fd31d96

     

       23
       23
       -
       --- /dev/null

     

       24
       24
       -
       +++ b/test/wasm/table-base.s

     

       25
       25
       -
       @@ -0,0 +1,72 @@

     

       26
       26
       -
       +# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o

     

       27
       27
       -
       +

     

       28
       28
       -
       +# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o

     

       29
       29
       -
       +# RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-DEFAULT

     

       30
       30
       -
       +

     

       31
       31
       -
       +# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o

     

       32
       32
       -
       +# RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-100

     

       33
       33
       -
       +

     

       34
       34
       -
       +.globl _start

     

       35
       35
       -
       +_start:

     

       36
       36
       -
       +  .functype _start () -> ()

     

       37
       37
       -
       +  i32.const _start

     

       38
       38
       -
       +  drop

     

       39
       39
       -
       +  end_function

     

       40
       40
       -
       +

     

       41
       41
       -
       +# CHECK-DEFAULT:       - Type:            TABLE

     

       42
       42
       -
       +# CHECK-DEFAULT-NEXT:    Tables:

     

       43
       43
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           0

     

       44
       44
       -
       +# CHECK-DEFAULT-NEXT:        ElemType:        FUNCREF

     

       45
       45
       -
       +# CHECK-DEFAULT-NEXT:        Limits:

     

       46
       46
       -
       +# CHECK-DEFAULT-NEXT:          Flags:           [ HAS_MAX ]

     

       47
       47
       -
       +# CHECK-DEFAULT-NEXT:          Minimum:         0x2

     

       48
       48
       -
       +# CHECK-DEFAULT-NEXT:          Maximum:         0x2

     

       49
       49
       -
       +

     

       50
       50
       -
       +# CHECK-DEFAULT:       - Type:            GLOBAL

     

       51
       51
       -
       +# CHECK-DEFAULT-NEXT:    Globals:

     

       52
       52
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           0

     

       53
       53
       -
       +# CHECK-DEFAULT-NEXT:        Type:            I32

     

       54
       54
       -
       +# CHECK-DEFAULT-NEXT:        Mutable:         true

     

       55
       55
       -
       +# CHECK-DEFAULT-NEXT:        InitExpr:

     

       56
       56
       -
       +# CHECK-DEFAULT-NEXT:          Opcode:          I32_CONST

     

       57
       57
       -
       +# CHECK-DEFAULT-NEXT:          Value:           66560

     

       58
       58
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           1

     

       59
       59
       -
       +# CHECK-DEFAULT-NEXT:        Type:            I32

     

       60
       60
       -
       +# CHECK-DEFAULT-NEXT:        Mutable:         false

     

       61
       61
       -
       +# CHECK-DEFAULT-NEXT:        InitExpr:

     

       62
       62
       -
       +# CHECK-DEFAULT-NEXT:          Opcode:          I32_CONST

     

       63
       63
       -
       +# CHECK-DEFAULT-NEXT:          Value:           1

     

       64
       64
       -
       +

     

       65
       65
       -
       +# CHECK-DEFAULT:       - Type:            EXPORT

     

       66
       66
       -
       +# CHECK-DEFAULT:           - Name:            __table_base

     

       67
       67
       -
       +# CHECK-DEFAULT-NEXT:        Kind:            GLOBAL

     

       68
       68
       -
       +# CHECK-DEFAULT-NEXT:        Index:           1

     

       69
       69
       -
       +

     

       70
       70
       -
       +# CHECK-100:       - Type:            TABLE

     

       71
       71
       -
       +# CHECK-100-NEXT:    Tables:

     

       72
       72
       -
       +# CHECK-100-NEXT:      - Index:           0

     

       73
       73
       -
       +# CHECK-100-NEXT:        ElemType:        FUNCREF

     

       74
       74
       -
       +# CHECK-100-NEXT:        Limits:

     

       75
       75
       -
       +# CHECK-100-NEXT:          Flags:           [ HAS_MAX ]

     

       76
       76
       -
       +# CHECK-100-NEXT:          Minimum:         0x65

     

       77
       77
       -
       +# CHECK-100-NEXT:          Maximum:         0x65

     

       78
       78
       -
       +

     

       79
       79
       -
       +# CHECK-100:       - Type:            GLOBAL

     

       80
       80
       -
       +# CHECK-100-NEXT:    Globals:

     

       81
       81
       -
       +# CHECK-100-NEXT:      - Index:           0

     

       82
       82
       -
       +# CHECK-100-NEXT:        Type:            I32

     

       83
       83
       -
       +# CHECK-100-NEXT:        Mutable:         true

     

       84
       84
       -
       +# CHECK-100-NEXT:        InitExpr:

     

       85
       85
       -
       +# CHECK-100-NEXT:          Opcode:          I32_CONST

     

       86
       86
       -
       +# CHECK-100-NEXT:          Value:           66560

     

       87
       87
       -
       +# CHECK-100-NEXT:      - Index:           1

     

       88
       88
       -
       +# CHECK-100-NEXT:        Type:            I32

     

       89
       89
       -
       +# CHECK-100-NEXT:        Mutable:         false

     

       90
       90
       -
       +# CHECK-100-NEXT:        InitExpr:

     

       91
       91
       -
       +# CHECK-100-NEXT:          Opcode:          I32_CONST

     

       92
       92
       -
       +# CHECK-100-NEXT:          Value:           100

     

       93
       93
       -
       +

     

       94
       94
       -
       +# CHECK-100:       - Type:            EXPORT

     

       95
       95
       -
       +# CHECK-100:           - Name:            __table_base

     

       96
       96
       -
       +# CHECK-100-NEXT:        Kind:            GLOBAL

     

       97
       97
       -
       +# CHECK-100-NEXT:        Index:           1

     

       98
       98
       -
       diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp

     

       99
       99
       -
       index 84304881f5ca34e..c2f5f0185781f36 100644

     

       100
       100
       -
       --- a/wasm/Driver.cpp

     

       101
       101
       -
       +++ b/wasm/Driver.cpp

     

       102
       102
       -
       @@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) {

     

       103
       103
       -
        

     

       104
       104
       -
          config->initialMemory = args::getInteger(args, OPT_initial_memory, 0);

     

       105
       105
       -
          config->globalBase = args::getInteger(args, OPT_global_base, 0);

     

       106
       106
       -
       +  config->tableBase = args::getInteger(args, OPT_table_base, 0);

     

       107
       107
       -
          config->maxMemory = args::getInteger(args, OPT_max_memory, 0);

     

       108
       108
       -
          config->zStackSize =

     

       109
       109
       -
              args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize);

     

       110
       110
       -
       @@ -573,6 +574,17 @@ static void setConfigs() {

     

       111
       111
       -
            if (config->exportTable)

     

       112
       112
       -
              error("-shared/-pie is incompatible with --export-table");

     

       113
       113
       -
            config->importTable = true;

     

       114
       114
       -
       +  } else {

     

       115
       115
       -
       +    // Default table base.  Defaults to 1, reserving 0 for the NULL function

     

       116
       116
       -
       +    // pointer.

     

       117
       117
       -
       +    if (!config->tableBase)

     

       118
       118
       -
       +      config->tableBase = 1;

     

       119
       119
       -
       +    // The default offset for static/global data, for when --global-base is

     

       120
       120
       -
       +    // not specified on the command line.  The precise value of 1024 is

     

       121
       121
       -
       +    // somewhat arbitrary, and pre-dates wasm-ld (Its the value that

     

       122
       122
       -
       +    // emscripten used prior to wasm-ld).

     

       123
       123
       -
       +    if (!config->globalBase && !config->relocatable && !config->stackFirst)

     

       124
       124
       -
       +      config->globalBase = 1024;

     

       125
       125
       -
          }

     

       126
       126
       -
        

     

       127
       127
       -
          if (config->relocatable) {

     

       128
       128
       -
       @@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) {

     

       129
       129
       -
            warn("-Bsymbolic is only meaningful when combined with -shared");

     

       130
       130
       -
          }

     

       131
       131
       -
        

     

       132
       132
       -
       -  if (config->globalBase && config->isPic) {

     

       133
       133
       -
       -    error("--global-base may not be used with -shared/-pie");

     

       134
       134
       -
       +  if (config->isPic) {

     

       135
       135
       -
       +    if (config->globalBase)

     

       136
       136
       -
       +      error("--global-base may not be used with -shared/-pie");

     

       137
       137
       -
       +    if (config->tableBase)

     

       138
       138
       -
       +      error("--table-base may not be used with -shared/-pie");

     

       139
       139
       -
          }

     

       140
       140
       -
        }

     

       141
       141
       -
        

     

       142
       142
       -
       diff --git a/wasm/Options.td b/wasm/Options.td

     

       143
       143
       -
       index 50417d2928e0a34..bb764396bf4df14 100644

     

       144
       144
       -
       --- a/wasm/Options.td

     

       145
       145
       -
       +++ b/wasm/Options.td

     

       146
       146
       -
       @@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">,

     

       147
       147
       -
          HelpText<"Remove maximum size from function table, allowing table to grow">;

     

       148
       148
       -
        

     

       149
       149
       -
        def global_base: JJ<"global-base=">,

     

       150
       150
       -
       -  HelpText<"Where to start to place global data">;

     

       151
       151
       -
       +  HelpText<"Memory offset at which to place global data (Defaults to 1024)">;

     

       152
       152
       -
        

     

       153
       153
       -
        def import_memory: FF<"import-memory">,

     

       154
       154
       -
          HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">;

     

       155
       155
       -
       @@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">,

     

       156
       156
       -
        def stack_first: FF<"stack-first">,

     

       157
       157
       -
          HelpText<"Place stack at start of linear memory rather than after data">;

     

       158
       158
       -
        

     

       159
       159
       -
       +def table_base: JJ<"table-base=">,

     

       160
       160
       -
       +  HelpText<"Table offset at which to place address taken functions (Defaults to 1)">;

     

       161
       161
       -
       +

     

       162
       162
       -
        defm whole_archive: B<"whole-archive",

     

       163
       163
       -
            "Force load of all members in a static library",

     

       164
       164
       -
            "Do not force load of all members in a static library (default)">;

     

       165
       165
       -
       diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp

     

       166
       166
       -
       index f25d358dc5bae6f..0576bf2907e49c4 100644

     

       167
       167
       -
       --- a/wasm/Writer.cpp

     

       168
       168
       -
       +++ b/wasm/Writer.cpp

     

       169
       169
       -
       @@ -358,13 +358,6 @@ void Writer::layoutMemory() {

     

       170
       170
       -
              memoryPtr = config->globalBase;

     

       171
       171
       -
            }

     

       172
       172
       -
          } else {

     

       173
       173
       -
       -    if (!config->globalBase && !config->relocatable && !config->isPic) {

     

       174
       174
       -
       -      // The default offset for static/global data, for when --global-base is

     

       175
       175
       -
       -      // not specified on the command line.  The precise value of 1024 is

     

       176
       176
       -
       -      // somewhat arbitrary, and pre-dates wasm-ld (Its the value that

     

       177
       177
       -
       -      // emscripten used prior to wasm-ld).

     

       178
       178
       -
       -      config->globalBase = 1024;

     

       179
       179
       -
       -    }

     

       180
       180
       -
            memoryPtr = config->globalBase;

     

       181
       181
       -
          }

     

       182
       182
       -
        

     

       183
       183
       -
       @@ -1685,7 +1678,6 @@ void Writer::run() {

     

       184
       184
       -
          // For PIC code the table base is assigned dynamically by the loader.

     

       185
       185
       -
          // For non-PIC, we start at 1 so that accessing table index 0 always traps.

     

       186
       186
       -
          if (!config->isPic) {

     

       187
       187
       -
       -    config->tableBase = 1;

     

       188
       188
       -
            if (WasmSym::definedTableBase)

     

       189
       189
       -
              WasmSym::definedTableBase->setVA(config->tableBase);

     

       190
       190
       -
            if (WasmSym::definedTableBase32)

-46

pkgs/development/compilers/llvm/17/lld/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index 3d6225646fe6..9b5d0b15af13 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwriting

     

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

     

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

     

       12
       12
       -
       -  set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

       13
       13
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       14
       14
       -
       +  # LLVM_CONFIG.

     

       15
       15
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

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

     

       17
       17
       -
       +    # path is removed.

     

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

     

       19
       19
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

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

     

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

     

       22
       22
       -
       +  else()

     

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

     

       24
       24
       -
       +  endif()

     

       25
       25
       -
       +

     

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

     

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

     

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

     

       29
       29
       -
        

     

       30
       30
       -
          find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}

     

       31
       31
       -
            NO_DEFAULT_PATH)

     

       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)

-19

pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch

···

       1
       1
       -
       This is the one remaining Polly install dirs related change that hasn't made it

     

       2
       2
       -
       into upstream yet; previously this patch file also included:

     

       3
       3
       -
       https://reviews.llvm.org/D117541

     

       4
       4
       -
       

     

       5
       5
       -
       diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake

     

       6
       6
       -
       index 518a09b45a42..bd9d6f5542ad 100644

     

       7
       7
       -
       --- a/tools/polly/cmake/polly_macros.cmake

     

       8
       8
       -
       +++ b/tools/polly/cmake/polly_macros.cmake

     

       9
       9
       -
       @@ -44,8 +44,8 @@ macro(add_polly_library name)

     

       10
       10
       -
          if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly")

     

       11
       11
       -
            install(TARGETS ${name}

     

       12
       12
       -
              EXPORT LLVMExports

     

       13
       13
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       14
       14
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

       15
       15
       -
       +	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

     

       16
       16
       -
       +      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       17
       17
       -
          endif()

     

       18
       18
       -
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})

     

       19
       19
       -
        endmacro(add_polly_library)

-137

pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index 471817d68286..c51463304159 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -1010,7 +1010,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 230620c37027..dd16cab1835e 100644

     

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

     

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

     

       18
       18
       -
       @@ -876,8 +876,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
       -
       @@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type)

     

       30
       30
       -
            set(LLVM_LINK_OR_COPY copy)

     

       31
       31
       -
          endif()

     

       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
       -
       @@ -2344,16 +2344,37 @@ 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(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

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

     

       54
       54
       -
       +    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back

     

       55
       55
       -
       +    # to `_install_rpath` here.

     

       56
       56
       -
       +    #

     

       57
       57
       -
       +    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.

     

       58
       58
       -
       +    # clang); instead LLVM is its own package and thus lands at its own nix

     

       59
       59
       -
       +    # store path. This makes it so that the default relative rpath (`../lib/`)

     

       60
       60
       -
       +    # does not point at the LLVM shared objects.

     

       61
       61
       -
       +    #

     

       62
       62
       -
       +    # More discussion here:

     

       63
       63
       -
       +    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329

     

       64
       64
       -
       +    #   - https://reviews.llvm.org/D146918 (16.0.5+)

     

       65
       65
       -
       +    #

     

       66
       66
       -
       +    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is

     

       67
       67
       -
       +    # no potential that this will result in us pulling in the "wrong" LLVM.

     

       68
       68
       -
       +    # Adding this to the build rpath means we aren't forced to use

     

       69
       69
       -
       +    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build

     

       70
       70
       -
       +    # dir, pre-install, will have the right rpath for LLVM).

     

       71
       71
       -
       +    #

     

       72
       72
       -
       +    # As noted in the differential above, an alternative solution is to have

     

       73
       73
       -
       +    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set

     

       74
       74
       -
       +    # `CMAKE_INSTALL_RPATH`.

     

       75
       75
       -
       +    set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       76
       76
       -
       +    set(_install_rpath ${extra_libdir})

     

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

     

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

     

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

     

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

     

       81
       81
       -
       index 891c9e6d618c..8d963f3b0069 100644

     

       82
       82
       -
       --- a/cmake/modules/AddOCaml.cmake

     

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

     

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

     

       85
       85
       -
          endforeach()

     

       86
       86
       -
        

     

       87
       87
       -
          if( APPLE )

     

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

     

       89
       89
       -
       +    set(ocaml_rpath "${LLVM_LIBRARY_DIR}")

     

       90
       90
       -
          elseif( UNIX )

     

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

     

       92
       92
       -
       +    set(ocaml_rpath "${LLVM_LIBRARY_DIR}")

     

       93
       93
       -
          endif()

     

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

     

       95
       95
       -
        

     

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

     

       97
       97
       -
       index d99af79aa38e..21e794224b99 100644

     

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

     

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

     

       100
       100
       -
       @@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       101
       101
       -
          )

     

       102
       102
       -
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       103
       103
       -
        

     

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

     

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

     

       106
       106
       -
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       107
       107
       -
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

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

     

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

     

       110
       110
       -
       index 370005cd8d7d..7e790bc52111 100644

     

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

     

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

     

       113
       113
       -
       @@ -23,6 +23,7 @@

     

       114
       114
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       115
       115
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       116
       116
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

       118
       118
       -
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       119
       119
       -
        #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       120
       120
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

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

     

       122
       122
       -
       index e86eb2b44b10..f63e207e792e 100644

     

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

     

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

     

       125
       125
       -
       @@ -366,7 +366,11 @@ int main(int argc, char **argv) {

     

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

     

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

     

       128
       128
       -
            }

     

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

     

       130
       130
       -
       +    {

     

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

     

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

     

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

     

       134
       134
       -
       +    }

     

       135
       135
       -
            {

     

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

     

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

-17

pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch

···

       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:

pkgs/development/compilers/llvm/17/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch

pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch

pkgs/development/compilers/llvm/17/openmp/fix-find-tool.patch pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch

-22

pkgs/development/compilers/llvm/17/openmp/gnu-install-dirs.patch

···

       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)

pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch

+6 -14

pkgs/development/compilers/llvm/common/clang/default.nix

···

       70
       70
        
             ];

     

       71
       71
        
             stripLen = 1;

     

       72
       72
        
             hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E=";

     

       73
       73
       -
           })

     

       74
       74
       -
           ++

     

       75
       75
       -
             lib.optional (stdenv.isAarch64 && lib.versions.major release_version == "17")

     

       76
       76
       -
               # Fixes llvm17 tblgen builds on aarch64.

     

       77
       77
       -
               # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680

     

       78
       78
       -
               (getVersionFile "clang/aarch64-tblgen.patch");

     

       73
       73
       +
           });

     

       79
       74
        
       

     

       80
       75
        
           nativeBuildInputs = [

     

       81
       76
        
             cmake

     

       82
       77
        
             python3

     

       83
       78
        
             ninja

     

       84
       79
        
           ]

     

       85
       85
       -
           ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser

     

       86
       86
       -
           ++ lib.optional enableManpages python3.pkgs.sphinx

     

       80
       80
       +
           ++ lib.optionals enableManpages [

     

       81
       81
       +
             python3.pkgs.myst-parser

     

       82
       82
       +
             python3.pkgs.sphinx

     

       83
       83
       +
           ]

     

       87
       84
        
           ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       88
       85
        
       

     

       89
       86
        
           buildInputs = [

     
···

       150
       147
        
           postInstall = ''

     

       151
       148
        
             ln -sv $out/bin/clang $out/bin/cpp

     

       152
       149
        
           ''

     

       153
       153
       -
           + (lib.optionalString (lib.versions.major release_version == "17") ''

     

       154
       154
       -
             mkdir -p $lib/lib/clang

     

       155
       155
       -
             mv $lib/lib/17 $lib/lib/clang/17

     

       156
       156
       -
           '')

     

       157
       150
        
           + (lib.optionalString

     

       158
       151
        
             ((lib.versionAtLeast release_version "19") && !(lib.versionAtLeast release_version "21"))

     

       159
       152
        
             ''

     
···

       206
       199
        
               ++ lib.optional (!targetPlatform.isLinux || !targetPlatform.isx86_64) "shadowstack"

     

       207
       200
        
               ++ lib.optional (!targetPlatform.isAarch64 || !targetPlatform.isLinux) "pacret"

     

       208
       201
        
               ++ lib.optional (

     

       209
       209
       -
                 (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1"))

     

       210
       210
       -
                 || !(targetPlatform.isLinux || targetPlatform.isFreeBSD)

     

       202
       202
       +
                 !(targetPlatform.isLinux || targetPlatform.isFreeBSD)

     

       211
       203
        
                 || !(

     

       212
       204
        
                   targetPlatform.isx86

     

       213
       205
        
                   || targetPlatform.isPower64

-34

pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-no-yield.patch

···

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

     

       2
       2
       -
       From: Ben Wolsieffer <benwolsieffer@gmail.com>

     

       3
       3
       -
       Date: Wed, 7 Dec 2022 18:03:56 -0500

     

       4
       4
       -
       Subject: [PATCH] [scudo][standalone] Only use yield on ARMv6K and newer

     

       5
       5
       -
       

     

       6
       6
       -
       The yield instruction is only available in ARMv6K and newer. It behaves as a

     

       7
       7
       -
       nop on single threaded platforms anyway, so use nop instead on unsupported

     

       8
       8
       -
       architectures.

     

       9
       9
       -
       

     

       10
       10
       -
       Differential Revision: https://reviews.llvm.org/D139600

     

       11
       11
       -
       ---

     

       12
       12
       -
        compiler-rt/lib/scudo/standalone/common.h | 5 +++++

     

       13
       13
       -
        1 file changed, 5 insertions(+)

     

       14
       14
       -
       

     

       15
       15
       -
       diff --git a/lib/scudo/standalone/common.h b/lib/scudo/standalone/common.h

     

       16
       16
       -
       index bc3dfec6dbba..862cda1d4bc4 100644

     

       17
       17
       -
       --- a/lib/scudo/standalone/common.h

     

       18
       18
       -
       +++ b/lib/scudo/standalone/common.h

     

       19
       19
       -
       @@ -109,7 +109,12 @@ inline void yieldProcessor(u8 Count) {

     

       20
       20
       -
        #elif defined(__aarch64__) || defined(__arm__)

     

       21
       21
       -
          __asm__ __volatile__("" ::: "memory");

     

       22
       22
       -
          for (u8 I = 0; I < Count; I++)

     

       23
       23
       -
       +#if __ARM_ARCH >= 6 && !defined(__ARM_ARCH_6__)

     

       24
       24
       -
       +    // yield is supported on ARMv6K and newer

     

       25
       25
       -
            __asm__ __volatile__("yield");

     

       26
       26
       -
       +#else

     

       27
       27
       -
       +    __asm__ __volatile__("nop");

     

       28
       28
       -
       +#endif

     

       29
       29
       -
        #endif

     

       30
       30
       -
          __asm__ __volatile__("" ::: "memory");

     

       31
       31
       -
        }

     

       32
       32
       -
       -- 

     

       33
       33
       -
       2.38.1

     

       34
       34
       -

+1 -20

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

···

       76
       76
        
           (getVersionFile "compiler-rt/normalize-var.patch")

     

       77
       77
        
           # Fix build on armv6l

     

       78
       78
        
           ./armv6-no-ldrexd-strexd.patch

     

       79
       79
       -
         ]

     

       80
       80
       -
         ++ lib.optional (lib.versionOlder release_version "18") (

     

       81
       81
       -
           getVersionFile "compiler-rt/gnu-install-dirs.patch"

     

       82
       82
       -
         )

     

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

     

       84
       84
       -
           name = "cfi_startproc-after-label.patch";

     

       85
       85
       -
           url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";

     

       86
       86
       -
           stripLen = 1;

     

       87
       87
       -
           hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";

     

       88
       88
       -
         })

     

       89
       89
       -
         ++

     

       90
       90
       -
           lib.optional (lib.versionOlder release_version "18")

     

       91
       91
       -
             # Prevent a compilation error on darwin

     

       92
       92
       -
             (getVersionFile "compiler-rt/darwin-targetconditionals.patch")

     

       93
       93
       -
         ++ [

     

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

     

       95
       80
        
           ./darwin-plistbuddy-workaround.patch

     

       96
       96
       -
         ]

     

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

     

       98
       98
       -
           # Fix build on armv6l

     

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

     

       100
       81
        
         ]

     

       101
       82
        
         ++ [

     

       102
       83
        
           (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")

     
···

       233
       214
        
               ''

     

       234
       215
        
                 substituteInPlace lib/builtins/clear_cache.c \

     

       235
       216
        
                   --replace-fail "#include <assert.h>" ""

     

       236
       236
       -
                 substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast release_version "18") "/x86"}.c \

     

       217
       217
       +
                 substituteInPlace lib/builtins/cpu_model/x86.c \

     

       237
       218
        
                   --replace-fail "#include <assert.h>" ""

     

       238
       219
        
               ''

     

       239
       220
        
             )

+1 -6

pkgs/development/compilers/llvm/common/default.nix

···

       171
       171
        
                 # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).

     

       172
       172
        
                 # So take the only patch known to be necessary.

     

       173
       173
        
                 (metadata.getVersionFile "clang/gnu-install-dirs.patch")

     

       174
       174
       -
               ]

     

       175
       175
       -
               ++

     

       176
       176
       -
                 lib.optional (stdenv.isAarch64 && lib.versions.major metadata.release_version == "17")

     

       177
       177
       -
                   # Fixes llvm17 tblgen builds on aarch64.

     

       178
       178
       -
                   # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680

     

       179
       179
       -
                   (metadata.getVersionFile "clang/aarch64-tblgen.patch");

     

       174
       174
       +
               ];

     

       180
       175
        
             };

     

       181
       176
        
       

     

       182
       177
        
             libclang = callPackage ./clang {

+17 -32

pkgs/development/compilers/llvm/common/libcxx/default.nix

···

       33
       33
        
         # Note: useLLVM is likely false for Darwin but true under pkgsLLVM

     

       34
       34
        
         useLLVM = stdenv.hostPlatform.useLLVM or false;

     

       35
       35
        
       

     

       36
       36
       -
         cxxabiCMakeFlags =

     

       37
       37
       -
           lib.optionals (lib.versionAtLeast release_version "18") [

     

       38
       38
       -
             (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

     

       39
       39
       -
           ]

     

       40
       40
       -
           ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) (

     

       41
       41
       -
             if lib.versionAtLeast release_version "18" then

     

       42
       42
       -
               [

     

       43
       43
       -
                 (lib.cmakeFeature "LIBCXXABI_ADDITIONAL_LIBRARIES" "unwind")

     

       44
       44
       -
                 (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       45
       45
       -
               ]

     

       46
       46
       -
             else

     

       47
       47
       -
               [

     

       48
       48
       -
                 (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       49
       49
       -
                 (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" true)

     

       50
       50
       -
               ]

     

       51
       51
       -
           )

     

       52
       52
       -
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       53
       53
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_THREADS" false)

     

       54
       54
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_EXCEPTIONS" false)

     

       55
       55
       -
           ]

     

       56
       56
       -
           ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [

     

       57
       57
       -
             # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245

     

       58
       58
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_SHARED" false)

     

       59
       59
       -
           ];

     

       36
       36
       +
         cxxabiCMakeFlags = [

     

       37
       37
       +
           (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

     

       38
       38
       +
         ]

     

       39
       39
       +
         ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [

     

       40
       40
       +
           (lib.cmakeFeature "LIBCXXABI_ADDITIONAL_LIBRARIES" "unwind")

     

       41
       41
       +
           (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       42
       42
       +
         ]

     

       43
       43
       +
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       44
       44
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_THREADS" false)

     

       45
       45
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_EXCEPTIONS" false)

     

       46
       46
       +
         ]

     

       47
       47
       +
         ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [

     

       48
       48
       +
           # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245

     

       49
       49
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_SHARED" false)

     

       50
       50
       +
         ];

     

       60
       51
        
       

     

       61
       52
        
         cxxCMakeFlags = [

     

       62
       53
        
           (lib.cmakeFeature "LIBCXX_CXX_ABI" cxxabiName)

     
···

       77
       68
        
           (lib.cmakeFeature "LIBCXX_HAS_MUSL_LIBC" "1")

     

       78
       69
        
         ]

     

       79
       70
        
         ++

     

       80
       80
       -
           lib.optionals

     

       81
       81
       -
             (

     

       82
       82
       -
               lib.versionAtLeast release_version "18"

     

       83
       83
       -
               && !useLLVM

     

       84
       84
       -
               && stdenv.hostPlatform.libc == "glibc"

     

       85
       85
       -
               && !stdenv.hostPlatform.isStatic

     

       86
       86
       -
             )

     

       71
       71
       +
           lib.optionals (!useLLVM && stdenv.hostPlatform.libc == "glibc" && !stdenv.hostPlatform.isStatic)

     

       87
       72
        
             [

     

       88
       73
        
               (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "gcc_s")

     

       89
       74
        
             ]

     

       90
       90
       -
         ++ lib.optionals (lib.versionAtLeast release_version "18" && stdenv.hostPlatform.isFreeBSD) [

     

       75
       75
       +
         ++ lib.optionals stdenv.hostPlatform.isFreeBSD [

     

       91
       76
        
           # Name and documentation claim this is for libc++abi, but its man effect is adding `-lunwind`

     

       92
       77
        
           # to the libc++.so linker script. We want FreeBSD's so-called libgcc instead of libunwind.

     

       93
       78
        
           (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

+3 -8

pkgs/development/compilers/llvm/common/libunwind/default.nix

···

       60
       60
        
         ]

     

       61
       61
        
         ++ devExtraCmakeFlags;

     

       62
       62
        
       

     

       63
       63
       -
         prePatch = lib.optionalString (lib.versionOlder release_version "18") ''

     

       64
       64
       -
           cd ../libunwind

     

       65
       65
       -
           chmod -R u+w .

     

       66
       66
       -
         '';

     

       67
       67
       -
       

     

       68
       68
       -
         postPatch = lib.optionalString (lib.versionOlder release_version "18") ''

     

       69
       69
       -
           cd ../runtimes

     

       70
       70
       -
         '';

     

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

     

       64
       64
       +
         prePatch = "";

     

       65
       65
       +
         postPatch = "";

     

       71
       66
        
       

     

       72
       67
        
         postInstall =

     

       73
       68
        
           lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows)

-1

pkgs/development/compilers/llvm/common/lld/default.nix

···

       38
       38
        
         patches = [

     

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

     

       40
       40
        
         ]

     

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

     

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

     

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

     

       44
       43
        
           fetchpatch {

+4 -18

pkgs/development/compilers/llvm/common/lldb/default.nix

···

       32
       32
        
       

     

       33
       33
        
       let

     

       34
       34
        
         vscodeExt = {

     

       35
       35
       -
           name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";

     

       36
       36
       -
           version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";

     

       35
       35
       +
           name = "lldb-dap";

     

       36
       36
       +
           version = "0.2.0";

     

       37
       37
        
         };

     

       38
       38
        
       in

     

       39
       39
        
       

     
···

       70
       70
        
       

     

       71
       71
        
           sourceRoot = "${finalAttrs.src.name}/lldb";

     

       72
       72
        
       

     

       73
       73
       -
           patches =

     

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

     

       75
       75
       -
               name = "libcxx-19-char_traits.patch";

     

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

     

       77
       77
       -
               stripLen = 1;

     

       78
       78
       -
               hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc=";

     

       79
       79
       -
             })

     

       80
       80
       -
             ++ [ ./gnu-install-dirs.patch ];

     

       73
       73
       +
           patches = [ ./gnu-install-dirs.patch ];

     

       81
       74
        
       

     

       82
       75
        
           nativeBuildInputs = [

     

       83
       76
        
             cmake

     
···

       90
       83
        
           ]

     

       91
       84
        
           ++ lib.optionals enableManpages [

     

       92
       85
        
             python3.pkgs.sphinx

     

       93
       93
       -
           ]

     

       94
       94
       -
           ++ lib.optionals (lib.versionOlder release_version "18" && enableManpages) [

     

       95
       95
       -
             python3.pkgs.recommonmark

     

       96
       96
       -
           ]

     

       97
       97
       -
           ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [

     

       98
       86
        
             python3.pkgs.myst-parser

     

       99
       87
        
           ]

     

       100
       88
        
           # TODO: Clean up on `staging`.

     
···

       174
       162
        
             # vscode:

     

       175
       163
        
             install -D ../tools/${vscodeExt.name}/package.json $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/package.json

     

       176
       164
        
             mkdir -p $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       177
       177
       -
             ln -s $out/bin/*${

     

       178
       178
       -
               if lib.versionAtLeast release_version "18" then vscodeExt.name else "-vscode"

     

       179
       179
       -
             } $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       165
       165
       +
             ln -s $out/bin/*${vscodeExt.name} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       180
       166
        
           '';

     

       181
       167
        
       

     

       182
       168
        
           passthru.vscodeExtName = vscodeExt.name;

+5 -24

pkgs/development/compilers/llvm/common/llvm/default.nix

···

       83
       83
        
           pname = "llvm";

     

       84
       84
        
           inherit version;

     

       85
       85
        
       

     

       86
       86
       -
           # Used when creating a version-suffixed symlink of libLLVM.dylib

     

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

     

       87
       87
        
           shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version));

     

       88
       88
        
       

     

       89
       89
        
           src =

     
···

       178
       178
        
                     stripLen = 1;

     

       179
       179
        
                   }

     

       180
       180
        
                 )

     

       181
       181
       -
             ++

     

       182
       182
       -
               lib.optional (lib.versions.major release_version == "17")

     

       183
       183
       -
                 # Fixes a crash with -fzero-call-used-regs=used-gpr

     

       184
       184
       -
                 # See also https://github.com/llvm/llvm-project/issues/75168

     

       185
       185
       -
                 (

     

       186
       186
       -
                   fetchpatch {

     

       187
       187
       -
                     name = "fix-fzero-call-used-regs.patch";

     

       188
       188
       -
                     url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch";

     

       189
       189
       -
                     stripLen = 1;

     

       190
       190
       -
                     hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8=";

     

       191
       191
       -
                   }

     

       192
       192
       -
                 )

     

       193
       181
        
             ++ lib.optionals (lib.versions.major release_version == "18") [

     

       194
       182
        
               # Reorgs one test so the next patch applies

     

       195
       183
        
               (fetchpatch {

     
···

       247
       235
        
             # Note: we intentionally use `python3Packages` instead of `python3.pkgs`;

     

       248
       236
        
             # splicing does *not* work with the latter. (TODO: fix)

     

       249
       237
        
             python3Packages.sphinx

     

       250
       250
       -
           ]

     

       251
       251
       -
           ++ optionals (lib.versionOlder version "18" && enableManpages) [

     

       252
       252
       -
             python3Packages.recommonmark

     

       253
       253
       -
           ]

     

       254
       254
       -
           ++ optionals (lib.versionAtLeast version "18" && enableManpages) [

     

       255
       238
        
             python3Packages.myst-parser

     

       256
       239
        
           ];

     

       257
       240
        
       

     
···

       309
       292
        
                 ''

     

       310
       293
        
               +

     

       311
       294
        
                 # fails when run in sandbox

     

       312
       312
       -
                 optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") ''

     

       295
       295
       +
                 optionalString (!stdenv.hostPlatform.isx86) ''

     

       313
       296
        
                   substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       314
       297
        
                     --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       315
       298
        
                 ''

     
···

       319
       302
        
               optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) (

     

       320
       303
        
                 # fails when run in sandbox

     

       321
       304
        
                 (

     

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

     

       305
       305
       +
                   ''

     

       323
       306
        
                     substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       324
       307
        
                       --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       325
       325
       -
                   '')

     

       308
       308
       +
                   ''

     

       326
       309
        
                   +

     

       327
       310
        
                     # This test fails on darwin x86_64 because `sw_vers` reports a different

     

       328
       311
        
                     # macOS version than what LLVM finds by reading

     
···

       583
       566
        
               --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'

     

       584
       567
        
           ''

     

       585
       568
        
           + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) ''

     

       586
       586
       -
             ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${

     

       587
       587
       -
               if lib.versionOlder release_version "18" then "$shortVersion" else release_version

     

       588
       588
       -
             }.dylib

     

       569
       569
       +
             ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib

     

       589
       570
        
           ''

     

       590
       571
        
           + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (

     

       591
       572
        
             if stdenv.buildPlatform.canExecute stdenv.hostPlatform then

-3

pkgs/development/compilers/llvm/common/openmp/default.nix

···

       51
       51
        
       

     

       52
       52
        
         patches =

     

       53
       53
        
           lib.optional (lib.versionOlder release_version "19") (getVersionFile "openmp/fix-find-tool.patch")

     

       54
       54
       -
           ++ lib.optional (lib.versionOlder release_version "18") (

     

       55
       55
       -
             getVersionFile "openmp/gnu-install-dirs.patch"

     

       56
       56
       -
           )

     

       57
       54
        
           ++ [

     

       58
       55
        
             (getVersionFile "openmp/run-lit-directly.patch")

     

       59
       56
        
           ];

+8 -42

pkgs/development/compilers/llvm/common/patches.nix

···

       7
       7
        
         ];

     

       8
       8
        
         "clang/purity.patch" = [

     

       9
       9
        
           {

     

       10
       10
       -
             after = "18";

     

       11
       10
        
             path = ../18;

     

       12
       11
        
           }

     

       13
       12
        
         ];

     

       14
       14
       -
         "clang/aarch64-tblgen.patch" = [

     

       15
       15
       -
           {

     

       16
       16
       -
             before = "18";

     

       17
       17
       -
             path = ../17;

     

       18
       18
       -
           }

     

       19
       19
       -
         ];

     

       20
       20
       -
         "lld/add-table-base.patch" = [

     

       21
       21
       -
           {

     

       22
       22
       -
             path = ../17;

     

       23
       23
       -
           }

     

       24
       24
       -
         ];

     

       25
       13
        
         "lld/gnu-install-dirs.patch" = [

     

       26
       14
        
           {

     

       27
       27
       -
             after = "18";

     

       28
       15
        
             path = ../18;

     

       29
       16
        
           }

     

       30
       17
        
         ];

     
···

       44
       31
        
             path = ../20;

     

       45
       32
        
           }

     

       46
       33
        
           {

     

       47
       47
       -
             after = "18";

     

       48
       34
        
             before = "20";

     

       49
       35
        
             path = ../18;

     

       50
       36
        
           }

     
···

       56
       42
        
           }

     

       57
       43
        
           {

     

       58
       44
        
             before = "20";

     

       59
       59
       -
             after = "18";

     

       60
       45
        
             path = ../18;

     

       61
       61
       -
           }

     

       62
       62
       -
           {

     

       63
       63
       -
             before = "18";

     

       64
       64
       -
             path = ../17;

     

       65
       46
        
           }

     

       66
       47
        
         ];

     

       67
       48
        
         "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       68
       49
        
           {

     

       69
       69
       -
             path = ../17;

     

       50
       50
       +
             path = ../18;

     

       70
       51
        
           }

     

       71
       52
        
         ];

     

       72
       53
        
         "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [

     

       73
       54
        
           {

     

       74
       74
       -
             after = "18";

     

       75
       55
        
             path = ../18;

     

       76
       56
        
           }

     

       77
       77
       -
           {

     

       78
       78
       -
             before = "18";

     

       79
       79
       -
             path = ../17;

     

       80
       80
       -
           }

     

       81
       57
        
         ];

     

       82
       58
        
         "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       83
       59
        
           {

     

       84
       84
       -
             path = ../17;

     

       60
       60
       +
             path = ../18;

     

       85
       61
        
           }

     

       86
       62
        
         ];

     

       87
       63
        
         "compiler-rt/X86-support-extension.patch" = [

     

       88
       64
        
           {

     

       89
       89
       -
             path = ../17;

     

       65
       65
       +
             path = ../18;

     

       90
       66
        
           }

     

       91
       67
        
         ];

     

       92
       68
        
         "compiler-rt/armv6-scudo-libatomic.patch" = [

     
···

       96
       72
        
           }

     

       97
       73
        
           {

     

       98
       74
        
             before = "19";

     

       99
       99
       -
             path = ../17;

     

       100
       100
       -
           }

     

       101
       101
       -
         ];

     

       102
       102
       -
         "compiler-rt/gnu-install-dirs.patch" = [

     

       103
       103
       -
           {

     

       104
       104
       -
             path = ../17;

     

       105
       105
       -
           }

     

       106
       106
       -
         ];

     

       107
       107
       -
         "compiler-rt/darwin-targetconditionals.patch" = [

     

       108
       108
       -
           {

     

       109
       109
       -
             path = ../17;

     

       75
       75
       +
             path = ../18;

     

       110
       76
        
           }

     

       111
       77
        
         ];

     

       112
       78
        
         "compiler-rt/normalize-var.patch" = [

     

       113
       79
        
           {

     

       114
       114
       -
             path = ../17;

     

       80
       80
       +
             path = ../18;

     

       115
       81
        
           }

     

       116
       82
        
         ];

     

       117
       83
        
         "openmp/fix-find-tool.patch" = [

     

       118
       84
        
           {

     

       119
       85
        
             before = "19";

     

       120
       120
       -
             path = ../17;

     

       86
       86
       +
             path = ../18;

     

       121
       87
        
           }

     

       122
       88
        
         ];

     

       123
       89
        
         "openmp/run-lit-directly.patch" = [

     

       124
       90
        
           {

     

       125
       125
       -
             path = ../17;

     

       91
       91
       +
             path = ../18;

     

       126
       92
        
           }

     

       127
       93
        
         ];

     

       128
       94
        
         "libclc/use-default-paths.patch" = [

     
···

       139
       105
        
         "libclc/gnu-install-dirs.patch" = [

     

       140
       106
        
           {

     

       141
       107
        
             before = "21";

     

       142
       142
       -
             path = ../17;

     

       108
       108
       +
             path = ../18;

     

       143
       109
        
           }

     

       144
       110
        
           {

     

       145
       111
        
             after = "21";

-1

pkgs/development/compilers/llvm/default.nix

···

       22
       22
        
       }@packageSetArgs:

     

       23
       23
        
       let

     

       24
       24
        
         versions = {

     

       25
       25
       -
           "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

     

       26
       25
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       27
       26
        
           "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";

     

       28
       27
        
           "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";

pkgs/test/default.nix

···

       21
       21
        
                   (filter (n: n != "llvmPackages_14"))

     

       22
       22
        
                   (filter (n: n != "llvmPackages_15"))

     

       23
       23
        
                   (filter (n: n != "llvmPackages_16"))

     

       24
       24
       +
                   (filter (n: n != "llvmPackages_17"))

     

       24
       25
        
                 ];

     

       25
       26
        
                 tests = lib.genAttrs pkgSets (

     

       26
       27
        
                   name:

+9 -2

pkgs/top-level/aliases.nix

···

       698
       698
        
         cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09

     

       699
       699
        
       

     

       700
       700
        
         # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.

     

       701
       701
       -
         clang17Stdenv = lowPrio llvmPackages_17.stdenv; # preserve, reason: see above

     

       702
       701
        
         clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above

     

       703
       702
        
         clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above

     

       704
       703
        
       

     

       705
       705
       -
         clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22

     

       706
       704
        
         clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22

     

       707
       705
        
         clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21

     

       708
       706
        
       

     
···

       1519
       1517
        
         clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1520
       1518
        
         clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1521
       1519
        
         clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1520
       1520
       +
       

     

       1521
       1521
       +
         llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1522
       1522
       +
         llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1523
       1523
       +
         lld_17 = throw "lld_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1524
       1524
       +
         lldb_17 = throw "lldb_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1525
       1525
       +
         mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1526
       1526
       +
         clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1527
       1527
       +
         clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1528
       1528
       +
         clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1522
       1529
        
       

     

       1523
       1530
        
         lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17

     

       1524
       1531
        
         loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25

-9

pkgs/top-level/all-packages.nix

···

       4633
       4633
        
         clang-manpages = llvmPackages.clang-manpages;

     

       4634
       4634
        
       

     

       4635
       4635
        
         clang = llvmPackages.clang;

     

       4636
       4636
       -
         clang_17 = llvmPackages_17.clang;

     

       4637
       4636
        
       

     

       4638
       4637
        
         clang-tools = llvmPackages.clang-tools;

     

       4639
       4638
        
       

     
···

       5360
       5359
        
         };

     

       5361
       5360
        
       

     

       5362
       5361
        
         lld = llvmPackages.lld;

     

       5363
       5363
       -
         lld_17 = llvmPackages_17.lld;

     

       5364
       5362
        
       

     

       5365
       5363
        
         lldb = llvmPackages.lldb;

     

       5366
       5366
       -
         lldb_17 = llvmPackages_17.lldb;

     

       5367
       5364
        
       

     

       5368
       5365
        
         llvm = llvmPackages.llvm;

     

       5369
       5369
       -
         llvm_17 = llvmPackages_17.llvm;

     

       5370
       5370
       -
       

     

       5371
       5371
       -
         mlir_17 = llvmPackages_17.mlir;

     

       5372
       5366
        
         flang = llvmPackages_20.flang;

     

       5373
       5367
        
       

     

       5374
       5368
        
         libclc = llvmPackages.libclc;

     
···

       5380
       5374
        
         inherit

     

       5381
       5375
        
           (rec {

     

       5382
       5376
        
             llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });

     

       5383
       5383
       -
       

     

       5384
       5384
       -
             llvmPackages_17 = llvmPackagesSet."17";

     

       5385
       5377
        
       

     

       5386
       5378
        
             llvmPackages_18 = llvmPackagesSet."18";

     

       5387
       5379
        
             clang_18 = llvmPackages_18.clang;

     
···

       5414
       5406
        
       

     

       5415
       5407
        
             mkLLVMPackages = llvmPackagesSet.mkPackage;

     

       5416
       5408
        
           })

     

       5417
       5417
       -
           llvmPackages_17

     

       5418
       5409
        
           llvmPackages_18

     

       5419
       5410
        
           clang_18

     

       5420
       5411
        
           lld_18