commit 51c0eeb414a49bf5ad5c70afb22b29787ee7994d · pyrox.dev/nixpkgs

-53

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

···

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

     

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

     

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

     

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

     

       5
       5
       -
        construction from lli.

     

       6
       6
       -
       

     

       7
       7
       -
       As of d0052ebbe2e the setUpGenericLLVMIRPlatform function will automatically

     

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

     

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

     

       10
       10
       -
       

     

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

     

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

     

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

     

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

     

       15
       15
       -
       

     

       16
       16
       -
       (cherry picked from commit 9052b37ab1aa67a039b34356f37236fecc42bac2)

     

       17
       17
       -
       ---

     

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

     

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

     

       20
       20
       -
       

     

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

     

       22
       22
       -
       index 448660a539a0b0..19246f03941673 100644

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       36
       36
       -
            Builder.getJITTargetMachineBuilder()

     

       37
       37
       -
                ->setRelocationModel(Reloc::PIC_)

     

       38
       38
       -
                .setCodeModel(CodeModel::Small);

     

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

     

       40
       40
       -
       -                                              const Triple &TT) {

     

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

     

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

     

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

     

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

     

       45
       45
       -
       -      return L;

     

       46
       46
       -
       -    });

     

       47
       47
       -
       +    Builder.setObjectLinkingLayerCreator(

     

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

     

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

     

       50
       50
       -
       +        });

     

       51
       51
       -
          }

     

       52
       52
       -
        

     

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

+10 -4

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

···

       501
       501
        
                       })

     

       502
       502
        
                     ]

     

       503
       503
        
                 ++

     

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

     

       505
       505
       -
                     # Fix OrcJIT

     

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

     

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

     

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

     

       505
       505
       +
                     # Fix OrcJIT tests with page sizes > 16k

     

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

     

       507
       507
       +
                     (

     

       508
       508
       +
                       fetchpatch {

     

       509
       509
       +
                         url = "https://github.com/llvm/llvm-project/commit/415607e10b56d0e6c4661ff1ec5b9b46bf433cba.patch";

     

       510
       510
       +
                         stripLen = 1;

     

       511
       511
       +
                         hash = "sha256-vBbuduJB+NnNE9qtR93k64XKrwvc7w3vowjL/aT+iEA=";

     

       512
       512
       +
                       }

     

       513
       513
       +
                     );

     

       508
       514
        
               pollyPatches =

     

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

     

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

+1 -16

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

···

       14
       14
        
         ninja,

     

       15
       15
        
         isFullBuild ? true,

     

       16
       16
        
         linuxHeaders,

     

       17
       17
       -
         fetchpatch,

     

       18
       17
        
       }:

     

       19
       18
        
       let

     

       20
       19
        
         pname = "libc";

     
···

       28
       27
        
         '');

     

       29
       28
        
       in

     

       30
       29
        
       stdenv.mkDerivation (finalAttrs: {

     

       31
       31
       -
         inherit pname version;

     

       30
       30
       +
         inherit pname version patches;

     

       32
       31
        
       

     

       33
       32
        
         src = src';

     

       34
       33
        
       

     

       35
       34
        
         sourceRoot = "${finalAttrs.src.name}/runtimes";

     

       36
       36
       -
       

     

       37
       37
       -
         patches =

     

       38
       38
       -
           lib.optional (lib.versions.major version == "20")

     

       39
       39
       -
             # Removes invalid token from the LLVM version being placed in the namespace.

     

       40
       40
       -
             # Can be removed when LLVM 20 bumps to rc2.

     

       41
       41
       -
             # PR: https://github.com/llvm/llvm-project/pull/126284

     

       42
       42
       -
             (

     

       43
       43
       -
               fetchpatch {

     

       44
       44
       -
                 url = "https://github.com/llvm/llvm-project/commit/3a3a3230d171e11842a9940b6da0f72022b1c5b3.patch";

     

       45
       45
       -
                 stripLen = 1;

     

       46
       46
       -
                 hash = "sha256-QiU1cWp+027ZZNVdvfGVwbIoRd9jqtSbftGsmaW1gig=";

     

       47
       47
       -
               }

     

       48
       48
       -
             )

     

       49
       49
       -
           ++ patches;

     

       50
       35
        
       

     

       51
       36
        
         nativeBuildInputs =

     

       52
       37
        
           [

+1 -1

pkgs/development/compilers/llvm/default.nix

···

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

     

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

     

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

     

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

     

       33
       33
       +
           "20.1.0-rc2".officialRelease.sha256 = "sha256-lBx+MWfYBM6XSJozacALMGlo0DUUWqnsBQyO8lDljSo=";

     

       34
       34
        
           "21.0.0-git".gitRelease = {

     

       35
       35
        
             rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0";

     

       36
       36
        
             rev-version = "21.0.0-unstable-2025-02-10";