Rebase patches (#40)

Author: Zentrik

julia-patches/1b7b3b8d354a28f5fb1381c61c5663819d29a974

@@ -1,4 +1,4 @@
-From e859ff28ffdaadf1338161d2d444bb4fb3836ec9 Mon Sep 17 00:00:00 2001
+From 0ecd905b06a59d851690b88ccc972fe3ed9fbd3f Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:02:11 +0000
 Subject: [PATCH] 1b7b3b8d354a28f5fb1381c61c5663819d29a974
@@ -8,10 +8,10 @@ Subject: [PATCH] 1b7b3b8d354a28f5fb1381c61c5663819d29a974
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/ccall.cpp b/src/ccall.cpp
-index 1b635ca408..71561b3b3f 100644
+index eb64adef44..263fbeef15 100644
 --- a/src/ccall.cpp
 +++ b/src/ccall.cpp
-@@ -2096,7 +2096,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
+@@ -2093,7 +2093,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
              }
              else if (f_name.starts_with("llvm.")) {
                  // compute and verify auto-mangling for intrinsic name

julia-patches/29e467fc78eb8b4308b57272ca4ad0d1f744f25f

@@ -1,4 +1,4 @@
-From 129a21e4fe99793e7ec7b16f3503e64c136c5702 Mon Sep 17 00:00:00 2001
+From 67be017d011f4237e5768fbc32e607ae25f814a1 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Sat, 4 Jan 2025 16:48:45 +0000
 Subject: [PATCH] 29e467fc78eb8b4308b57272ca4ad0d1f744f25f
@@ -8,18 +8,18 @@ Adapt to "Deprecate Type::getPointerTo()"
  src/aotcompile.cpp             | 10 +++++-----
  src/ccall.cpp                  | 10 +++++-----
  src/cgutils.cpp                |  4 ++--
- src/codegen.cpp                | 28 +++++++++++++---------------
+ src/codegen.cpp                | 27 +++++++++++++--------------
  src/intrinsics.cpp             |  6 +++---
- src/llvm-codegen-shared.h      | 22 +++++++++-------------
+ src/llvm-codegen-shared.h      | 14 +++++---------
  src/llvm-final-gc-lowering.cpp |  2 +-
  src/llvm-late-gc-lowering.cpp  |  4 ++--
  src/llvm-multiversioning.cpp   |  6 +++---
  src/llvm-pass-helpers.cpp      |  2 +-
  src/llvm-ptls.cpp              |  2 +-
- 11 files changed, 45 insertions(+), 51 deletions(-)
+ 11 files changed, 41 insertions(+), 46 deletions(-)
 
 diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
-index 0600106c41..3583b4916b 100644
+index 0235758979..3291ddc5cc 100644
 --- a/src/aotcompile.cpp
 +++ b/src/aotcompile.cpp
 @@ -1553,7 +1553,7 @@ static void construct_vars(Module &M, Partition &partition, StringRef suffix) {
@@ -62,7 +62,7 @@ index 0600106c41..3583b4916b 100644
              auto FT = FunctionType::get(T_int32, {T_pvoid, T_int32, T_pvoid}, false);
              auto F = Function::Create(FT, Function::ExternalLinkage, "_DllMainCRTStartup", metadataM);
 diff --git a/src/ccall.cpp b/src/ccall.cpp
-index 170adffc52..150a3e1c0d 100644
+index ad6dc4327c..6e9b546399 100644
 --- a/src/ccall.cpp
 +++ b/src/ccall.cpp
 @@ -105,7 +105,7 @@ static bool runtime_sym_gvs(jl_codectx_t &ctx, const char *f_lib, const char *f_
@@ -101,7 +101,7 @@ index 170adffc52..150a3e1c0d 100644
      GlobalVariable *got = new GlobalVariable(*M, T_pvoidfunc, false,
                                               GlobalVariable::ExternalLinkage,
                                               plt,
-@@ -2129,7 +2129,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
+@@ -2126,7 +2126,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
      }
      else if (symarg.fptr != NULL) {
          ++LiteralCCalls;
@@ -111,7 +111,7 @@ index 170adffc52..150a3e1c0d 100644
          setName(ctx.emission_context, llvmf, "ccall_fptr");
      }
 diff --git a/src/cgutils.cpp b/src/cgutils.cpp
-index 11f47dcf2e..77b67a5ce5 100644
+index 4f6eacbc4f..9b4a25cbd9 100644
 --- a/src/cgutils.cpp
 +++ b/src/cgutils.cpp
 @@ -123,7 +123,7 @@ static Value *stringConstPtr(
@@ -133,7 +133,7 @@ index 11f47dcf2e..77b67a5ce5 100644
          for_each_uniontype_small(
              [&](unsigned idx, jl_datatype_t *jt) {
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 5adf210489..519c16487f 100644
+index f463c25184..3fe7093768 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
 @@ -838,7 +838,7 @@ static const auto jlhasnofield_func = new JuliaFunction<>{
@@ -162,24 +162,16 @@ index 5adf210489..519c16487f 100644
              {JuliaType::get_prjlvalue_ty(C), getPointerTy(C)}, false); },
      nullptr,
  };
-@@ -1380,7 +1380,6 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
-         auto T_jlvalue = JuliaType::get_jlvalue_ty(C);
-         auto T_pjlvalue = PointerType::get(T_jlvalue, 0);
-         auto T_prjlvalue = PointerType::get(T_jlvalue, AddressSpace::Tracked);
--        auto T_ppjlvalue = PointerType::get(T_pjlvalue, 0);
-         auto T_pprjlvalue = PointerType::get(T_prjlvalue, 0);
-         return FunctionType::get(T_prjlvalue,
-             {
-@@ -1388,7 +1387,7 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
+@@ -1387,7 +1387,7 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
                  T_pjlvalue, // result
                  getPointerTy(C), // cache
                  T_pjlvalue, // fill
 -                FunctionType::get(getPointerTy(C), { getPointerTy(C), T_ppjlvalue }, false)->getPointerTo(), // trampoline
 +                getPointerTy(C), // trampoline
                  T_pjlvalue, // env
-                 T_pprjlvalue, // vals
+                 T_derived, // vals
              }, false);
-@@ -1459,7 +1458,7 @@ static const auto box_ssavalue_func = new JuliaFunction<TypeFnContextAndSizeT>{
+@@ -1458,7 +1458,7 @@ static const auto box_ssavalue_func = new JuliaFunction<TypeFnContextAndSizeT>{
  };
  static const auto jlgetbuiltinfptr_func = new JuliaFunction<>{
      XSTR(jl_get_builtin_fptr),
@@ -188,7 +180,7 @@ index 5adf210489..519c16487f 100644
              {JuliaType::get_prjlvalue_ty(C)}, false); },
      nullptr,
  };
-@@ -1547,7 +1546,7 @@ static const auto julia_call = new JuliaFunction<>{
+@@ -1550,7 +1550,7 @@ static const auto julia_call = new JuliaFunction<>{
      [](LLVMContext &C) {
          auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
          return FunctionType::get(T_prjlvalue,
@@ -197,7 +189,7 @@ index 5adf210489..519c16487f 100644
               T_prjlvalue}, // %f
              true); }, // %args
      get_attrs_basic,
-@@ -1560,7 +1559,7 @@ static const auto julia_call2 = new JuliaFunction<>{
+@@ -1563,7 +1563,7 @@ static const auto julia_call2 = new JuliaFunction<>{
      [](LLVMContext &C) {
          auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
          return FunctionType::get(T_prjlvalue,
@@ -206,7 +198,7 @@ index 5adf210489..519c16487f 100644
               T_prjlvalue, // %arg1
               T_prjlvalue}, // %f
              true); }, // %args
-@@ -1574,7 +1573,7 @@ static const auto julia_call3 = new JuliaFunction<>{
+@@ -1577,7 +1577,7 @@ static const auto julia_call3 = new JuliaFunction<>{
          auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
          Type *T = PointerType::get(JuliaType::get_jlvalue_ty(C), AddressSpace::Derived);
          return FunctionType::get(T_prjlvalue,
@@ -215,7 +207,7 @@ index 5adf210489..519c16487f 100644
               T}, // %f
              true); }, // %args
      get_attrs_basic,
-@@ -5474,7 +5473,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
+@@ -5551,7 +5551,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
          std::string namep("p");
          namep += specFunctionObject;
          GlobalVariable *GV = cast_or_null<GlobalVariable>(jl_Module->getNamedValue(namep));
@@ -224,7 +216,7 @@ index 5adf210489..519c16487f 100644
          if (GV == nullptr) {
              GV = new GlobalVariable(*jl_Module, pfunc, false,
                                      GlobalVariable::ExternalLinkage,
-@@ -8127,8 +8126,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
+@@ -8175,8 +8175,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
          union_alloca_type((jl_uniontype_t*)jlrettype, allunbox, props.union_bytes, props.union_align, props.union_minalign);
          if (props.union_bytes) {
              props.cc = jl_returninfo_t::Union;
@@ -234,7 +226,7 @@ index 5adf210489..519c16487f 100644
              argnames.push_back("union_bytes_return");
              Type *pair[] = { ctx.types().T_prjlvalue, getInt8Ty(ctx.builder.getContext()) };
              rt = StructType::get(ctx.builder.getContext(), ArrayRef<Type*>(pair));
-@@ -8157,7 +8155,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
+@@ -8205,7 +8204,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
              props.union_align = props.union_minalign = julia_alignment(jlrettype);
              // sret is always passed from alloca
              assert(M);
@@ -243,7 +235,7 @@ index 5adf210489..519c16487f 100644
              argnames.push_back("sret_return");
              srt = rt;
              rt = getVoidTy(ctx.builder.getContext());
-@@ -8292,7 +8290,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
+@@ -8340,7 +8339,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
      }
      else {
          if (fval->getType()->isIntegerTy())
@@ -253,10 +245,10 @@ index 5adf210489..519c16487f 100644
      if (auto F = dyn_cast<Function>(fval)) {
          if (gcstack_arg && ctx.emission_context.use_swiftcc)
 diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
-index c2fb3760fd..594b8dd2e3 100644
+index 6365ff1660..d9c5fdb639 100644
 --- a/src/intrinsics.cpp
 +++ b/src/intrinsics.cpp
-@@ -776,7 +776,7 @@ static jl_cgval_t emit_pointerref(jl_codectx_t &ctx, ArrayRef<jl_cgval_t> argv)
+@@ -780,7 +780,7 @@ static jl_cgval_t emit_pointerref(jl_codectx_t &ctx, ArrayRef<jl_cgval_t> argv)
          Type *ptrty = julia_type_to_llvm(ctx, ety, &isboxed);
          assert(!isboxed);
          if (!type_is_ghost(ptrty)) {
@@ -265,7 +257,7 @@ index c2fb3760fd..594b8dd2e3 100644
              thePtr = ctx.builder.CreateInBoundsGEP(ptrty, thePtr, im1);
              auto load = typed_load(ctx, thePtr, nullptr, ety, ctx.tbaa().tbaa_data, nullptr, isboxed, AtomicOrdering::NotAtomic, false, align_nb);
              setName(ctx.emission_context, load.V, "pointerref");
-@@ -968,7 +968,7 @@ static jl_cgval_t emit_atomic_pointerref(jl_codectx_t &ctx, ArrayRef<jl_cgval_t>
+@@ -972,7 +972,7 @@ static jl_cgval_t emit_atomic_pointerref(jl_codectx_t &ctx, ArrayRef<jl_cgval_t>
          Type *ptrty = julia_type_to_llvm(ctx, ety, &isboxed);
          assert(!isboxed);
          if (!type_is_ghost(ptrty)) {
@@ -274,7 +266,7 @@ index c2fb3760fd..594b8dd2e3 100644
              auto load = typed_load(ctx, thePtr, nullptr, ety, ctx.tbaa().tbaa_data, nullptr, isboxed, llvm_order, false, nb);
              setName(ctx.emission_context, load.V, "atomic_pointerref");
              return load;
-@@ -1062,7 +1062,7 @@ static jl_cgval_t emit_atomic_pointerop(jl_codectx_t &ctx, intrinsic f, ArrayRef
+@@ -1066,7 +1066,7 @@ static jl_cgval_t emit_atomic_pointerop(jl_codectx_t &ctx, intrinsic f, ArrayRef
          assert(!isboxed);
          Value *thePtr;
          if (!type_is_ghost(ptrty))
@@ -284,10 +276,10 @@ index c2fb3760fd..594b8dd2e3 100644
              thePtr = nullptr; // could use any value here, since typed_store will not use it
          jl_cgval_t ret = typed_store(ctx, thePtr, x, y, ety, ctx.tbaa().tbaa_data, nullptr, nullptr, isboxed,
 diff --git a/src/llvm-codegen-shared.h b/src/llvm-codegen-shared.h
-index d9551e0552..35d2bda072 100644
+index ff6f5a9729..ecf02a8f57 100644
 --- a/src/llvm-codegen-shared.h
 +++ b/src/llvm-codegen-shared.h
-@@ -34,24 +34,24 @@ namespace JuliaType {
+@@ -34,19 +34,19 @@ namespace JuliaType {
      }
 
      static inline llvm::PointerType* get_pjlvalue_ty(llvm::LLVMContext &C, unsigned addressSpace=0) {
@@ -311,40 +303,7 @@ index d9551e0552..35d2bda072 100644
      }
 
      static inline auto get_jlfunc_ty(llvm::LLVMContext &C) {
-         auto T_prjlvalue = get_prjlvalue_ty(C);
--        auto T_pprjlvalue = llvm::PointerType::get(T_prjlvalue, 0);
-+        auto T_pprjlvalue = llvm::PointerType::get(C, 0);
-         return llvm::FunctionType::get(T_prjlvalue, {
-                 T_prjlvalue,  // function
-                 T_pprjlvalue, // args[]
-@@ -61,7 +61,7 @@ namespace JuliaType {
- 
-     static inline auto get_jlfunc2_ty(llvm::LLVMContext &C) {
-         auto T_prjlvalue = get_prjlvalue_ty(C);
--        auto T_pprjlvalue = llvm::PointerType::get(T_prjlvalue, 0);
-+        auto T_pprjlvalue = llvm::PointerType::get(C, 0);
-         return llvm::FunctionType::get(T_prjlvalue, {
-                 T_prjlvalue,  // function
-                 T_pprjlvalue, // args[]
-@@ -72,7 +72,7 @@ namespace JuliaType {
- 
-     static inline auto get_jlfunc3_ty(llvm::LLVMContext &C) {
-         auto T_prjlvalue = get_prjlvalue_ty(C);
--        auto T_pprjlvalue = llvm::PointerType::get(T_prjlvalue, 0);
-+        auto T_pprjlvalue = llvm::PointerType::get(C, 0);
-         auto T = get_pjlvalue_ty(C, Derived);
-         return llvm::FunctionType::get(T_prjlvalue, {
-                 T,  // function
-@@ -83,7 +83,7 @@ namespace JuliaType {
- 
-     static inline auto get_jlfuncparams_ty(llvm::LLVMContext &C) {
-         auto T_prjlvalue = get_prjlvalue_ty(C);
--        auto T_pprjlvalue = llvm::PointerType::get(T_prjlvalue, 0);
-+        auto T_pprjlvalue = llvm::PointerType::get(C, 0);
-         return llvm::FunctionType::get(T_prjlvalue, {
-                 T_prjlvalue,  // function
-                 T_pprjlvalue, // args[]
-@@ -96,10 +96,6 @@ namespace JuliaType {
+@@ -95,10 +95,6 @@ namespace JuliaType {
      static inline auto get_voidfunc_ty(llvm::LLVMContext &C) {
          return llvm::FunctionType::get(llvm::Type::getVoidTy(C), /*isVarArg*/false);
      }
@@ -355,7 +314,7 @@ index d9551e0552..35d2bda072 100644
  }
 
  // return how many Tracked pointers are in T (count > 0),
-@@ -229,7 +225,7 @@ static inline void emit_gc_safepoint(llvm::IRBuilder<> &builder, llvm::Type *T_s
+@@ -228,7 +224,7 @@ static inline void emit_gc_safepoint(llvm::IRBuilder<> &builder, llvm::Type *T_s
      else {
          Function *F = M->getFunction("julia.safepoint");
          if (!F) {
@@ -378,7 +337,7 @@ index 76dcd94489..4e539fea8f 100644
 
      // Zero out the GC frame.
 diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 45ac0e0980..e9ea2fdc27 100644
+index e03fbd8ccd..317e89d46a 100644
 --- a/src/llvm-late-gc-lowering.cpp
 +++ b/src/llvm-late-gc-lowering.cpp
 @@ -1993,7 +1993,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S, bool *CFGModified) {

julia-patches/2f50b280dc8e995ef67ad31a5f71adc4c270890d

@@ -1,4 +1,4 @@
-From d6a36eb79c07f698ec7370c9812acb9a58efb757 Mon Sep 17 00:00:00 2001
+From f38d9e78f9475f6d86e1156d149548e2b2a39ceb Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:02:11 +0000
 Subject: [PATCH] 2f50b280dc8e995ef67ad31a5f71adc4c270890d
@@ -14,10 +14,10 @@ Subject: [PATCH] 2f50b280dc8e995ef67ad31a5f71adc4c270890d
  7 files changed, 30 insertions(+), 30 deletions(-)
 
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 7728aac3c8..b65a16bbce 100644
+index a0b9e13a80..3de982c3e4 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
-@@ -2376,7 +2376,7 @@ static GlobalVariable *get_pointer_to_constant(jl_codegen_params_t &emission_con
+@@ -2379,7 +2379,7 @@ static GlobalVariable *get_pointer_to_constant(jl_codegen_params_t &emission_con
  static AllocaInst *emit_static_alloca(jl_codectx_t &ctx, Type *lty, Align align)
  {
      ++EmittedAllocas;
@@ -27,7 +27,7 @@ index 7728aac3c8..b65a16bbce 100644
 
  static AllocaInst *emit_static_alloca(jl_codectx_t &ctx, unsigned nb, Align align)
 diff --git a/src/llvm-alloc-opt.cpp b/src/llvm-alloc-opt.cpp
-index a9e1b1e02d..8419c4cfeb 100644
+index 7dd794a4d8..7928d6824f 100644
 --- a/src/llvm-alloc-opt.cpp
 +++ b/src/llvm-alloc-opt.cpp
 @@ -427,12 +427,12 @@ void Optimizer::insertLifetimeEnd(Value *ptr, Constant *sz, Instruction *insert)
@@ -86,7 +86,7 @@ index baf844dffa..e09f5cad92 100644
                          createNewInstruction(CI, call, MSSAU);
                          LLVM_DEBUG(dbgs() << "Cloned and sunk gc_preserve_end: " << *CI << "\n");
 diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 0f790ac46d..45ac0e0980 100644
+index a254ecafab..e03fbd8ccd 100644
 --- a/src/llvm-late-gc-lowering.cpp
 +++ b/src/llvm-late-gc-lowering.cpp
 @@ -359,10 +359,10 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {

julia-patches/390300d9f41df6ad71f0f4196ef4885d4bd5dc48

@@ -1,4 +1,4 @@
-From 3452ebd7d650f7ae5b308cadaacb6af19a079542 Mon Sep 17 00:00:00 2001
+From 4a6d3feb9e43c51f8593219ec869e88cbfdfae09 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:33:31 +0000
 Subject: [PATCH] 390300d9f41df6ad71f0f4196ef4885d4bd5dc48
@@ -9,7 +9,7 @@ Adapt to "Add ThinOrFullLTOPhase to optimizer pipeline"
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/pipeline.cpp b/src/pipeline.cpp
-index a40cbf02eb..e2b995e257 100644
+index 5e29b56675..4523c80033 100644
 --- a/src/pipeline.cpp
 +++ b/src/pipeline.cpp
 @@ -250,7 +250,7 @@ namespace {

julia-patches/9a258664024d12a06ba8eb9344e270a9bb5f5d87

@@ -1,4 +1,4 @@
-From c1ea11cc92ca0a08bee51749be92239a2452d13f Mon Sep 17 00:00:00 2001
+From 56e877ef0663debb978e7a1547805997dc66b0b6 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:02:10 +0000
 Subject: [PATCH] 9a258664024d12a06ba8eb9344e270a9bb5f5d87
@@ -8,7 +8,7 @@ Subject: [PATCH] 9a258664024d12a06ba8eb9344e270a9bb5f5d87
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 1ca45a98b0..7728aac3c8 100644
+index eefc675bdd..a0b9e13a80 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
 @@ -76,6 +76,7 @@
@@ -19,7 +19,7 @@ index 1ca45a98b0..7728aac3c8 100644
 
  #ifdef USE_ITTAPI
  #include "ittapi/ittnotify.h"
-@@ -10379,15 +10380,17 @@ namespace llvm {
+@@ -10427,15 +10428,17 @@ namespace llvm {
      class MachineBasicBlock;
      class MachineFunction;
      raw_ostream& operator<<(raw_ostream &OS, const MachineBasicBlock &MBB);

julia-patches/b1aa0b0b88a0bca2553f8c6d6c52ec3b7205064b

@@ -1,4 +1,4 @@
-From e92847892c38657606ac65fcc0556212b7b6157f Mon Sep 17 00:00:00 2001
+From cd04c834e724007ffad51d0341c2a2160b700166 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:02:10 +0000
 Subject: [PATCH] b1aa0b0b88a0bca2553f8c6d6c52ec3b7205064b
@@ -8,10 +8,10 @@ Subject: [PATCH] b1aa0b0b88a0bca2553f8c6d6c52ec3b7205064b
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
-index 21d865891e..54b1b7fbeb 100644
+index 0acb7beaca..4140b6ba2a 100644
 --- a/src/jitlayers.cpp
 +++ b/src/jitlayers.cpp
-@@ -1950,7 +1950,7 @@ void fixupTM(TargetMachine &TM) {
+@@ -1924,7 +1924,7 @@ void fixupTM(TargetMachine &TM) {
  llvm::DataLayout jl_create_datalayout(TargetMachine &TM) {
      // Mark our address spaces as non-integral
      auto jl_data_layout = TM.createDataLayout();

julia-patches/bb3f5e1fed7c6ba733b7f273e93f5d3930976185

@@ -1,4 +1,4 @@
-From 858b8af9c74b5f7b944584d5a69e11ccdfd85ae7 Mon Sep 17 00:00:00 2001
+From 05141569c0b4b98227b62959ab3921fd7e82cd9c Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Sat, 16 Nov 2024 15:30:41 +0000
 Subject: [PATCH] bb3f5e1fed7c6ba733b7f273e93f5d3930976185

julia-patches/dc11c0601577afb8f67513d041ee25dabe3555b9

@@ -1,4 +1,4 @@
-From 2d3fe62b4cc095ac50c5a84b1cecd05980b00436 Mon Sep 17 00:00:00 2001
+From 45dfa34c637cb8b60676213a62b0227ffdc73030 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Mon, 11 Nov 2024 21:03:05 +0000
 Subject: [PATCH] dc11c0601577afb8f67513d041ee25dabe3555b9
@@ -9,7 +9,7 @@ Adapt to move of `absoluteSymbols`
  1 file changed, 1 insertion(+)
 
 diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
-index 54b1b7fbeb..9bf4b634ce 100644
+index 4140b6ba2a..f959b85e18 100644
 --- a/src/jitlayers.cpp
 +++ b/src/jitlayers.cpp
 @@ -14,6 +14,7 @@