commit 06f4e972efa3fe78d8f2ab5d3cd14a1d071f411f · pyrox.dev/nixpkgs

+68

pkgs/development/compilers/llvm/20/compiler-rt/libc-free.patch

···

       1
       +
       From 5eaae2daff7722ee01eee239e131ee1f62643abe Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Peter Waller <peter.waller@arm.com>

     

       3
       +
       Date: Wed, 5 Feb 2025 19:46:15 +0000

     

       4
       +
       Subject: [PATCH] [compiler-rt][AArch64] Enable libc-free builtins Linux build

     

       5
       +
       

     

       6
       +
       Without this change, libc++abi.so.1.0 fails to link with:

     

       7
       +
       

     

       8
       +
       ```

     

       9
       +
       error: undefined sybol: __aarch64_sme_accessible

     

       10
       +
       ```

     

       11
       +
       

     

       12
       +
       This symbol is provided by baremetal libc's such as newlib.

     

       13
       +
       

     

       14
       +
       In order to compile a libc with compiler-rt, it is necessary first to

     

       15
       +
       build a compiler-rt with no dependency on libc to acquire the builtins.

     

       16
       +
       The intended linux test requires getauxval which is provided by libc.

     

       17
       +
       

     

       18
       +
       To that end, there are examples in the wild of building a compiler-rt

     

       19
       +
       without libc by specifying -DCOMPILER_RT_BAREMETAL_BUILD=ON.

     

       20
       +
       On Linux, this gives a builtins build with (almost) no libc dependencies.

     

       21
       +
       

     

       22
       +
       See for example:

     

       23
       +
       

     

       24
       +
       https://github.com/NixOS/nixpkgs/blob/d7fe3bcaca37e79d8b3cbde4dd69edeafbd35313/pkgs/development/compilers/llvm/common/compiler-rt/default.nix#L116-L118

     

       25
       +
       

     

       26
       +
       ```

     

       27
       +
         ] ++ lib.optionals (!haveLibc || bareMetal) [

     

       28
       +
           "-DCMAKE_C_COMPILER_WORKS=ON"

     

       29
       +
           "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

     

       30
       +
       ```

     

       31
       +
       

     

       32
       +
       The above specifies that a !haveLibc build sets

     

       33
       +
       `-DCOMPILER_RT_BAREMETAL_BUILD`, which is done for example in a `pkgsLLVM` build.

     

       34
       +
       

     

       35
       +
       AIUI, acquiring such a builtins build of compiler-rt is necessary to build a

     

       36
       +
       pure LLVM toolchain, since builtins are required to build libc (and

     

       37
       +
       libcxx is required to build a full compiler-rt).

     

       38
       +
       

     

       39
       +
       The effect of falling back to unimplemented is that this early-stage

     

       40
       +
       builtins build is incapable of doing function multiversioning tests and

     

       41
       +
       falls back to behaving as-if the feature is unavailable.

     

       42
       +
       

     

       43
       +
       This behaviour changed in

     

       44
       +
       https://github.com/llvm/llvm-project/pull/119414, which introduced a

     

       45
       +
       subtle change in semantics in the removal of

     

       46
       +
       compiler-rt/lib/builtins/aarch64/sme-abi-init.c (definition of getauxval

     

       47
       +
       macro, which was bracketed by `#if defined(__linux__)`) vs the new

     

       48
       +
       definition which does not test for linux.

     

       49
       +
       

     

       50
       +
       The proposed change is reinstating things as they were before #119414.

     

       51
       +
       ---

     

       52
       +
        compiler-rt/lib/builtins/cpu_model/aarch64.c | 2 +-

     

       53
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       54
       +
       

     

       55
       +
       diff --git a/lib/builtins/cpu_model/aarch64.c b/lib/builtins/cpu_model/aarch64.c

     

       56
       +
       index 4082fd62ea11a25..50438bcc7ddd885 100644

     

       57
       +
       --- a/lib/builtins/cpu_model/aarch64.c

     

       58
       +
       +++ b/lib/builtins/cpu_model/aarch64.c

     

       59
       +
       @@ -80,7 +80,7 @@ struct {

     

       60
       +
        #include "aarch64/fmv/getauxval.inc"

     

       61
       +
        #elif defined(_WIN32)

     

       62
       +
        #include "aarch64/fmv/windows.inc"

     

       63
       +
       -#elif defined(ENABLE_BAREMETAL_AARCH64_FMV)

     

       64
       +
       +#elif defined(ENABLE_BAREMETAL_AARCH64_FMV) && !defined(__linux__)

     

       65
       +
        #include "aarch64/fmv/baremetal.inc"

     

       66
       +
        #else

     

       67
       +
        #include "aarch64/fmv/unimplemented.inc"

     

       68
       +

+139

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

···

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

     

       2
       +
       index c9ff3696e22d..bd96aab5e237 100644

     

       3
       +
       --- a/CMakeLists.txt

     

       4
       +
       +++ b/CMakeLists.txt

     

       5
       +
       @@ -1133,9 +1133,9 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")

     

       6
       +
          add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src

     

       7
       +
            ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)

     

       8
       +
          install(TARGETS tf_xla_runtime EXPORT LLVMExports

     

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

     

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

     

       11
       +
          install(TARGETS tf_xla_runtime EXPORT LLVMDevelopmentExports

     

       12
       +
       -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       13
       +
       +    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       14
       +
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)

     

       15
       +
          # Once we add more modules, we should handle this more automatically.

     

       16
       +
          if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)

     

       17
       +
       diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake

     

       18
       +
       index baf47677b247..81954240a9bf 100644

     

       19
       +
       --- a/cmake/modules/AddLLVM.cmake

     

       20
       +
       +++ b/cmake/modules/AddLLVM.cmake

     

       21
       +
       @@ -974,8 +974,8 @@ macro(add_llvm_library name)

     

       22
       +
              endif()

     

       23
       +
              install(TARGETS ${name}

     

       24
       +
                      ${export_to_llvmexports}

     

       25
       +
       -              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       26
       +
       -              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       27
       +
       +              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       28
       +
       +              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       29
       +
                      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       30
       +
        

     

       31
       +
              if (NOT LLVM_ENABLE_IDE)

     

       32
       +
       @@ -2243,7 +2243,7 @@ function(llvm_install_library_symlink name dest type)

     

       33
       +
            set(LLVM_LINK_OR_COPY copy)

     

       34
       +
          endif()

     

       35
       +
        

     

       36
       +
       -  set(output_dir lib${LLVM_LIBDIR_SUFFIX})

     

       37
       +
       +  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       38
       +
          if(WIN32 AND "${type}" STREQUAL "SHARED")

     

       39
       +
            set(output_dir "${CMAKE_INSTALL_BINDIR}")

     

       40
       +
          endif()

     

       41
       +
       @@ -2519,16 +2519,37 @@ function(llvm_setup_rpath name)

     

       42
       +
        

     

       43
       +
          if (APPLE)

     

       44
       +
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

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

     

       46
       +
       +    set(_install_rpath ${extra_libdir})

     

       47
       +
          elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)

     

       48
       +
            # $ORIGIN is not interpreted at link time by aix ld.

     

       49
       +
            # Since BUILD_SHARED_LIBS is only recommended for use by developers,

     

       50
       +
            # hardcode the rpath to build/install lib dir first in this mode.

     

       51
       +
            # FIXME: update this when there is better solution.

     

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

     

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

     

       54
       +
          elseif(UNIX)

     

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

     

       56
       +
       +    # to `_install_rpath` here.

     

       57
       +
       +    #

     

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

     

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

     

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

     

       61
       +
       +    # does not point at the LLVM shared objects.

     

       62
       +
       +    #

     

       63
       +
       +    # More discussion here:

     

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

     

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

     

       66
       +
       +    #

     

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

     

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

     

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

     

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

     

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

     

       72
       +
       +    #

     

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

     

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

     

       75
       +
       +    # `CMAKE_INSTALL_RPATH`.

     

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

     

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

     

       78
       +
       +    set(_install_rpath ${extra_libdir})

     

       79
       +
            if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")

     

       80
       +
              set_property(TARGET ${name} APPEND_STRING PROPERTY

     

       81
       +
                           LINK_FLAGS " -Wl,-z,origin ")

     

       82
       +
       diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake

     

       83
       +
       index 2d9116b08a52..2dd7cad4ec66 100644

     

       84
       +
       --- a/cmake/modules/AddOCaml.cmake

     

       85
       +
       +++ b/cmake/modules/AddOCaml.cmake

     

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

     

       87
       +
          endforeach()

     

       88
       +
        

     

       89
       +
          if( APPLE )

     

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

     

       91
       +
       +    set(ocaml_rpath ${LLVM_LIBRARY_DIR})

     

       92
       +
          elseif( UNIX )

     

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

     

       94
       +
       +    set(ocaml_rpath ${LLVM_LIBRARY_DIR})

     

       95
       +
          endif()

     

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

     

       97
       +
        

     

       98
       +
       diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt

     

       99
       +
       index ef4cfa3acdb5..7478e157a7c2 100644

     

       100
       +
       --- a/cmake/modules/CMakeLists.txt

     

       101
       +
       +++ b/cmake/modules/CMakeLists.txt

     

       102
       +
       @@ -130,7 +130,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       103
       +
          )

     

       104
       +
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       105
       +
        

     

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

     

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

     

       108
       +
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       109
       +
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

       110
       +
          # FIXME: Should there be other entries here?

     

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

     

       112
       +
       index 370005cd8d7d..7e790bc52111 100644

     

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

     

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

     

       115
       +
       @@ -23,6 +23,7 @@

     

       116
       +
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       117
       +
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       118
       +
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

       119
       +
       +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"

     

       120
       +
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       121
       +
        #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       122
       +
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       123
       +
       diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp

     

       124
       +
       index d5b76b1bb6c1..1dbdb2a8f10d 100644

     

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

     

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

     

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

     

       128
       +
              sys::fs::make_absolute(ActivePrefix, Path);

     

       129
       +
              ActiveBinDir = std::string(Path);

     

       130
       +
            }

     

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

     

       132
       +
       +    {

     

       133
       +
       +      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       134
       +
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       135
       +
       +      ActiveLibDir = std::string(Path);

     

       136
       +
       +    }

     

       137
       +
            {

     

       138
       +
              SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);

     

       139
       +
              sys::fs::make_absolute(ActivePrefix, Path);

+53

pkgs/development/compilers/llvm/20/llvm/orcjit.patch

···

       1
       +
       From 03d6f704d07aa3650a2f59be6f7802a8735460c3 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Lang Hames <lhames@gmail.com>

     

       3
       +
       Date: Wed, 29 Jan 2025 03:58:29 +0000

     

       4
       +
       Subject: [PATCH] [ORC][LLI] Remove redundant eh-frame registration plugin

     

       5
       +
        construction from lli.

     

       6
       +
       

     

       7
       +
       As of d0052ebbe2e the setUpGenericLLVMIRPlatform function will automatically

     

       8
       +
       add an instance of the EHFrameRegistrationPlugin (for LLJIT instances whose

     

       9
       +
       object linking layers are ObjectLinkingLayers, not RTDyldObjectLinkingLayers).

     

       10
       +
       

     

       11
       +
       This commit removes the redundant plugin creation in the object linking

     

       12
       +
       layer constructor function in lli.cpp to prevent duplicate registration of

     

       13
       +
       eh-frames, which is likely the cause of recent bot failures, e.g.

     

       14
       +
       https://lab.llvm.org/buildbot/#/builders/108/builds/8685.

     

       15
       +
       

     

       16
       +
       (cherry picked from commit 9052b37ab1aa67a039b34356f37236fecc42bac2)

     

       17
       +
       ---

     

       18
       +
        llvm/tools/lli/lli.cpp | 14 ++++----------

     

       19
       +
        1 file changed, 4 insertions(+), 10 deletions(-)

     

       20
       +
       

     

       21
       +
       diff --git a/llvm/tools/lli/lli.cpp b/tools/lli/lli.cpp

     

       22
       +
       index 448660a539a0b0..19246f03941673 100644

     

       23
       +
       --- a/llvm/tools/lli/lli.cpp

     

       24
       +
       +++ b/tools/lli/lli.cpp

     

       25
       +
       @@ -27,9 +27,7 @@

     

       26
       +
        #include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"

     

       27
       +
        #include "llvm/ExecutionEngine/Orc/DebugUtils.h"

     

       28
       +
        #include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h"

     

       29
       +
       -#include "llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h"

     

       30
       +
        #include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"

     

       31
       +
       -#include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h"

     

       32
       +
        #include "llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h"

     

       33
       +
        #include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"

     

       34
       +
        #include "llvm/ExecutionEngine/Orc/IRPartitionLayer.h"

     

       35
       +
       @@ -1033,14 +1031,10 @@ int runOrcJIT(const char *ProgName) {

     

       36
       +
            Builder.getJITTargetMachineBuilder()

     

       37
       +
                ->setRelocationModel(Reloc::PIC_)

     

       38
       +
                .setCodeModel(CodeModel::Small);

     

       39
       +
       -    Builder.setObjectLinkingLayerCreator([&P](orc::ExecutionSession &ES,

     

       40
       +
       -                                              const Triple &TT) {

     

       41
       +
       -      auto L = std::make_unique<orc::ObjectLinkingLayer>(ES);

     

       42
       +
       -      if (P != LLJITPlatform::ExecutorNative)

     

       43
       +
       -        L->addPlugin(std::make_unique<orc::EHFrameRegistrationPlugin>(

     

       44
       +
       -            ES, ExitOnErr(orc::EPCEHFrameRegistrar::Create(ES))));

     

       45
       +
       -      return L;

     

       46
       +
       -    });

     

       47
       +
       +    Builder.setObjectLinkingLayerCreator(

     

       48
       +
       +        [&](orc::ExecutionSession &ES, const Triple &TT) {

     

       49
       +
       +          return std::make_unique<orc::ObjectLinkingLayer>(ES);

     

       50
       +
       +        });

     

       51
       +
          }

     

       52
       +
        

     

       53
       +
          auto J = ExitOnErr(Builder.create());

+17 -2

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

···

       124
        
                     ];

     

       125
        
                     "llvm/gnu-install-dirs.patch" = [

     

       126
        
                       {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       127
        
                         after = "18";

     

       0
        
       
     

       128
        
                         path = ../18;

     

       129
        
                       }

     

       130
        
                     ];

     
···

       494
        
                         hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI=";

     

       495
        
                         stripLen = 1;

     

       496
        
                       })

     

       497
       -
                     ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       498
        
               pollyPatches =

     

       499
        
                 [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]

     

       500
        
                 ++ lib.optional (lib.versionAtLeast metadata.release_version "15")

     
···

       1076
        
                 url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";

     

       1077
        
                 hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";

     

       1078
        
                 relative = "compiler-rt";

     

       1079
       -
               });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1080
        
           in

     

       1081
        
           (

     

       1082
        
             {

···

       124
        
                     ];

     

       125
        
                     "llvm/gnu-install-dirs.patch" = [

     

       126
        
                       {

     

       127
       +
                         after = "20";

     

       128
       +
                         path = ../20;

     

       129
       +
                       }

     

       130
       +
                       {

     

       131
        
                         after = "18";

     

       132
       +
                         before = "20";

     

       133
        
                         path = ../18;

     

       134
        
                       }

     

       135
        
                     ];

     
···

       499
        
                         hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI=";

     

       500
        
                         stripLen = 1;

     

       501
        
                       })

     

       502
       +
                     ]

     

       503
       +
                 ++

     

       504
       +
                   lib.optional (lib.versions.major metadata.release_version == "20")

     

       505
       +
                     # Fix OrcJIT

     

       506
       +
                     # PR: https://github.com/llvm/llvm-project/pull/125431

     

       507
       +
                     (metadata.getVersionFile "llvm/orcjit.patch");

     

       508
        
               pollyPatches =

     

       509
        
                 [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]

     

       510
        
                 ++ lib.optional (lib.versionAtLeast metadata.release_version "15")

     
···

       1086
        
                 url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";

     

       1087
        
                 hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";

     

       1088
        
                 relative = "compiler-rt";

     

       1089
       +
               })

     

       1090
       +
               # Fixes baremetal

     

       1091
       +
               # PR: https://github.com/llvm/llvm-project/pull/125922

     

       1092
       +
               ++ lib.optional (lib.versionAtLeast metadata.release_version "20") (

     

       1093
       +
                 metadata.getVersionFile "compiler-rt/libc-free.patch"

     

       1094
       +
               );

     

       1095
        
           in

     

       1096
        
           (

     

       1097
        
             {

+3 -3

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

···

       31
        
             stdenv.override {

     

       32
        
               cc = stdenv.cc.override {

     

       33
        
                 nixSupport = stdenv.cc.nixSupport // {

     

       34
       -
                   cc-cflags = lib.remove "-lunwind" stdenv.cc.nixSupport.cc-cflags;

     

       35
        
                 };

     

       36
        
               };

     

       37
        
             }

     
···

       58
        
         outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");

     

       59
        
       

     

       60
        
         postUnpack = lib.optionalString isFullBuild ''

     

       61
       -
           patchShebangs $sourceRoot/../$pname/hdrgen/yaml_to_classes.py

     

       62
       -
           chmod +x $sourceRoot/../$pname/hdrgen/yaml_to_classes.py

     

       63
        
         '';

     

       64
        
       

     

       65
        
         prePatch = ''

···

       31
        
             stdenv.override {

     

       32
        
               cc = stdenv.cc.override {

     

       33
        
                 nixSupport = stdenv.cc.nixSupport // {

     

       34
       +
                   cc-cflags = lib.remove "-lunwind" (stdenv.cc.nixSupport.cc-cflags or [ ]);

     

       35
        
                 };

     

       36
        
               };

     

       37
        
             }

     
···

       58
        
         outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");

     

       59
        
       

     

       60
        
         postUnpack = lib.optionalString isFullBuild ''

     

       61
       +
           patchShebangs $sourceRoot/../$pname/utils/hdrgen/main.py

     

       62
       +
           chmod +x $sourceRoot/../$pname/utils/hdrgen/main.py

     

       63
        
         '';

     

       64
        
       

     

       65
        
         prePatch = ''

+5 -4

pkgs/development/compilers/llvm/default.nix

···

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

     

       31
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       32
        
           "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";

     

       33
       -
           "20.0.0-git".gitRelease = {

     

       34
       -
             rev = "6383a12e3b4339fa4743bb97da4d51dea6d2e2ea";

     

       35
       -
             rev-version = "20.0.0-unstable-2025-01-25";

     

       36
       -
             sha256 = "sha256-LMew+lFm+HrR5iwFDnoXA6B2LiU/pVqsy1YrP9xr5GU=";

     

       0
        
       
     

       37
        
           };

     

       38
        
         } // llvmVersions;

     

       39

···

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

     

       31
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       32
        
           "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";

     

       33
       +
           "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME=";

     

       34
       +
           "21.0.0-git".gitRelease = {

     

       35
       +
             rev = "312055d1da169f043e65b35fcd62d6d685700114";

     

       36
       +
             rev-version = "21.0.0-unstable-2025-02-01";

     

       37
       +
             sha256 = "sha256-V14ypUGn7GxzchmKjoSH2oiHDUQa07b4bQWjjRpQKCo=";

     

       38
        
           };

     

       39
        
         } // llvmVersions;

     

       40

+15 -3

pkgs/top-level/all-packages.nix

···

       6432
        
           lldb_19 = llvmPackages_19.lldb;

     

       6433
        
           llvm_19 = llvmPackages_19.llvm;

     

       6434
        
           bolt_19 = llvmPackages_19.bolt;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6435
        
         }) llvmPackages_12

     

       6436
        
           llvmPackages_13

     

       6437
        
           llvmPackages_14

     
···

       6448
        
           lld_19

     

       6449
        
           lldb_19

     

       6450
        
           llvm_19

     

       6451
       -
           bolt_19;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6452
        
       

     

       6453
        
         lorri = callPackage ../tools/misc/lorri {

     

       6454
        
           inherit (darwin.apple_sdk.frameworks) CoreServices Security;

     
···

       8977
        
           else if name == "wasilibc" then targetPackages.wasilibc or wasilibc

     

       8978
        
           else if name == "relibc" then targetPackages.relibc or relibc

     

       8979
        
           else if name == "llvm" then

     

       8980
       -
             # Use llvmPackages_git until LLVM 20 is the default.

     

       8981
       -
             targetPackages.llvmPackages_git.libc or llvmPackages_git.libc

     

       8982
        
           else throw "Unknown libc ${name}";

     

       8983
        
       

     

       8984
        
         libcCross =

···

       6432
        
           lldb_19 = llvmPackages_19.lldb;

     

       6433
        
           llvm_19 = llvmPackages_19.llvm;

     

       6434
        
           bolt_19 = llvmPackages_19.bolt;

     

       6435
       +
       

     

       6436
       +
           llvmPackages_20 = llvmPackagesSet."20";

     

       6437
       +
           clang_20 = llvmPackages_20.clang;

     

       6438
       +
           lld_20 = llvmPackages_20.lld;

     

       6439
       +
           lldb_20 = llvmPackages_20.lldb;

     

       6440
       +
           llvm_20 = llvmPackages_20.llvm;

     

       6441
       +
           bolt_20 = llvmPackages_20.bolt;

     

       6442
        
         }) llvmPackages_12

     

       6443
        
           llvmPackages_13

     

       6444
        
           llvmPackages_14

     
···

       6455
        
           lld_19

     

       6456
        
           lldb_19

     

       6457
        
           llvm_19

     

       6458
       +
           bolt_19

     

       6459
       +
           llvmPackages_20

     

       6460
       +
           clang_20

     

       6461
       +
           lld_20

     

       6462
       +
           lldb_20

     

       6463
       +
           llvm_20

     

       6464
       +
           bolt_20;

     

       6465
        
       

     

       6466
        
         lorri = callPackage ../tools/misc/lorri {

     

       6467
        
           inherit (darwin.apple_sdk.frameworks) CoreServices Security;

     
···

       8990
        
           else if name == "wasilibc" then targetPackages.wasilibc or wasilibc

     

       8991
        
           else if name == "relibc" then targetPackages.relibc or relibc

     

       8992
        
           else if name == "llvm" then

     

       8993
       +
             targetPackages.llvmPackages_20.libc or llvmPackages_20.libc

     

       0
        
       
     

       8994
        
           else throw "Unknown libc ${name}";

     

       8995
        
       

     

       8996
        
         libcCross =