From e13b594c70d5d85e0180f248de12224cd0139015 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 5 Jan 2022 04:57:40 -0600 Subject: dev-lang/julia: rename patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Matthias Maier --- dev-lang/julia/Manifest | 6 +- dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch | 17 + .../files/julia-1.6.5-llvm_13_compat_part_1.patch | 172 ++++++++++ .../files/julia-1.6.5-llvm_13_compat_part_2.patch | 80 +++++ .../files/julia-1.6.5-llvm_13_compat_part_3.patch | 375 +++++++++++++++++++++ .../files/julia-1.6.5-make-install-no-build.patch | 17 + .../julia/files/julia-1.7.0-hardcoded-libs.patch | 72 ---- dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch | 17 - .../files/julia-1.7.0-llvm_13_compat_part_1.patch | 172 ---------- .../files/julia-1.7.0-llvm_13_compat_part_2.patch | 80 ----- .../files/julia-1.7.0-llvm_13_compat_part_3.patch | 375 --------------------- .../files/julia-1.7.0-make-install-no-build.patch | 17 - .../julia/files/julia-1.7.1-hardcoded-libs.patch | 72 ++++ dev-lang/julia/julia-1.6.5.ebuild | 12 +- dev-lang/julia/julia-1.7.1-r2.ebuild | 22 +- 15 files changed, 753 insertions(+), 753 deletions(-) create mode 100644 dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch create mode 100644 dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch create mode 100644 dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch create mode 100644 dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch create mode 100644 dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch delete mode 100644 dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch create mode 100644 dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch (limited to 'dev-lang') diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 12e16a297558..399954d47d5e 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,9 +1,9 @@ DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc -DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f -DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 -DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638 +DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f +DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 +DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8 diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch new file mode 100644 index 000000000000..f0abc7b8f60d --- /dev/null +++ b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch @@ -0,0 +1,17 @@ +This patch comes from + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch + +diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl +index 9ffcaa3646..5f571e7b26 100644 +--- a/stdlib/LibGit2/src/types.jl ++++ b/stdlib/LibGit2/src/types.jl +@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_ + push_update_reference::Ptr{Cvoid} = C_NULL + push_negotiation::Ptr{Cvoid} = C_NULL + transport::Ptr{Cvoid} = C_NULL ++ @static if LibGit2.VERSION >= v"1.2.0" ++ remote_ready::Ptr{Cvoid} = C_NULL ++ end + payload::Any = nothing + @static if LibGit2.VERSION >= v"0.99.0" + resolve_url::Ptr{Cvoid} = C_NULL diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch new file mode 100644 index 000000000000..1398be7ec873 --- /dev/null +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch @@ -0,0 +1,172 @@ +This patch is from the julialang repository: + https://github.com/JuliaLang/julia/commit/677ce6d3.patch +but reference comes form ARCH Linux juia package + https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk + +From 677ce6d3adc2f70886f72795b0e5c739e75730ee Mon Sep 17 00:00:00 2001 +From: Valentin Churavy +Date: Sat, 28 Aug 2021 16:48:32 +0200 +Subject: [PATCH] [LLVM] Adapt to LLVM 13 changes + +--- + src/cgutils.cpp | 8 +++++++- + src/codegen.cpp | 2 +- + src/disasm.cpp | 8 ++++++++ + src/jitlayers.cpp | 7 +++++++ + src/llvm-late-gc-lowering.cpp | 5 +++-- + src/llvm-multiversioning.cpp | 5 +++++ + src/llvm-remove-addrspaces.cpp | 8 ++++++++ + 7 files changed, 39 insertions(+), 4 deletions(-) + +diff --git a/src/cgutils.cpp b/src/cgutils.cpp +index 4e9917b6b078..928e1a07b2f1 100644 +--- a/src/cgutils.cpp ++++ b/src/cgutils.cpp +@@ -2757,8 +2757,14 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt) + size_t nargs; + if (const auto *CC = dyn_cast(constant)) + nargs = CC->getNumOperands(); +- else if (const auto *CAZ = dyn_cast(constant)) ++ else if (const auto *CAZ = dyn_cast(constant)) { ++#if JL_LLVM_VERSION >= 130000 ++ // SVE: Elsewhere we use `getMinKownValue` ++ nargs = CAZ->getElementCount().getFixedValue(); ++#else + nargs = CAZ->getNumElements(); ++#endif ++ } + else if (const auto *CDS = dyn_cast(constant)) + nargs = CDS->getNumElements(); + else +diff --git a/src/codegen.cpp b/src/codegen.cpp +index 5cc9f66ffaef..9000513151fe 100644 +--- a/src/codegen.cpp ++++ b/src/codegen.cpp +@@ -7394,7 +7394,7 @@ static std::pair, jl_llvm_functions_t> + #endif + continue; + } +- assert(find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check ++ assert(std::find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check + TerminatorInst *terminator = FromBB->getTerminator(); + if (!terminator->getParent()->getUniqueSuccessor()) { + // Can't use `llvm::SplitCriticalEdge` here because +diff --git a/src/disasm.cpp b/src/disasm.cpp +index 6157873ad71c..589f618396ea 100644 +--- a/src/disasm.cpp ++++ b/src/disasm.cpp +@@ -857,8 +857,16 @@ static void jl_dump_asm_internal( + assert(MRI && "Unable to create target register info!"); + + std::unique_ptr MOFI(new MCObjectFileInfo()); ++#if JL_LLVM_VERSION >= 130000 ++ MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features); ++ assert(MSTI && "Unable to create subtarget info!"); ++ ++ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr); ++ MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false); ++#else + MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); + MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx); ++#endif + + // Set up Subtarget and Disassembler + std::unique_ptr +diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp +index 60b1903aaa80..12497cadf491 100644 +--- a/src/jitlayers.cpp ++++ b/src/jitlayers.cpp +@@ -10,6 +10,9 @@ + #include + #include + #include ++#if JL_LLVM_VERSION >= 130000 ++#include ++#endif + #include + #include + #include +@@ -654,7 +657,11 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM, LLVMContext *LLVMCtx) + MemMgr(createRTDyldMemoryManager()), + JuliaListener(CreateJuliaJITEventListener()), + TSCtx(std::unique_ptr(LLVMCtx)), ++#if JL_LLVM_VERSION >= 130000 ++ ES(cantFail(orc::SelfExecutorProcessControl::Create())), ++#else + ES(), ++#endif + GlobalJD(ES.createBareJITDylib("JuliaGlobals")), + JD(ES.createBareJITDylib("JuliaOJIT")), + ObjectLayer( +diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp +index 0aac7638be0d..db8b19bacea5 100644 +--- a/src/llvm-late-gc-lowering.cpp ++++ b/src/llvm-late-gc-lowering.cpp +@@ -709,7 +709,7 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { + else + Numbers[i] = Number; + } +- if (auto VTy = dyn_cast(SI->getType())) { ++ if (auto VTy = dyn_cast(SI->getType())) { + if (NumRoots != Numbers.size()) { + // broadcast the scalar root number to fill the vector + assert(NumRoots == 1); +@@ -736,11 +736,12 @@ void LateLowerGCFrame::LiftPhi(State &S, PHINode *Phi) { + SmallVector lifted; + std::vector Numbers; + unsigned NumRoots = 1; +- if (auto VTy = dyn_cast(Phi->getType())) { ++ if (auto VTy = dyn_cast(Phi->getType())) { + NumRoots = VTy->getNumElements(); + Numbers.resize(NumRoots); + } + else { ++ // TODO: SVE + assert(isa(Phi->getType()) && "unimplemented"); + } + for (unsigned i = 0; i < NumRoots; ++i) { +diff --git a/src/llvm-multiversioning.cpp b/src/llvm-multiversioning.cpp +index 68081eb53d3a..a82600162fa9 100644 +--- a/src/llvm-multiversioning.cpp ++++ b/src/llvm-multiversioning.cpp +@@ -403,7 +403,12 @@ void CloneCtx::clone_function(Function *F, Function *new_f, ValueToValueMapTy &v + vmap[&*J] = &*DestI++; + } + SmallVector Returns; ++#if JL_LLVM_VERSION >= 130000 ++ // We are cloning into the same module ++ CloneFunctionInto(new_f, F, vmap, CloneFunctionChangeType::GlobalChanges, Returns); ++#else + CloneFunctionInto(new_f, F, vmap, true, Returns); ++#endif + } + + // Clone all clone_all targets. Makes sure that the base targets are all available. +diff --git a/src/llvm-remove-addrspaces.cpp b/src/llvm-remove-addrspaces.cpp +index ada10c8d5f1f..7c6ef093fbce 100644 +--- a/src/llvm-remove-addrspaces.cpp ++++ b/src/llvm-remove-addrspaces.cpp +@@ -345,7 +345,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) + for (auto MD : MDs) + NGV->addMetadata( + MD.first, ++#if JL_LLVM_VERSION >= 130000 ++ *MapMetadata(MD.second, VMap)); ++#else + *MapMetadata(MD.second, VMap, RF_MoveDistinctMDs)); ++#endif + + copyComdat(NGV, GV); + +@@ -372,7 +376,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) + NF, + F, + VMap, ++#if JL_LLVM_VERSION >= 130000 ++ CloneFunctionChangeType::GlobalChanges, ++#else + /*ModuleLevelChanges=*/true, ++#endif + Returns, + "", + nullptr, diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch new file mode 100644 index 000000000000..5a8c2cde93d5 --- /dev/null +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch @@ -0,0 +1,80 @@ +This patch is from julialang repository: + https://github.com/JuliaLang/julia/commit/47f9139e.patch +but reference comes form ARCH Linux juia package + https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk + +From 47f9139e88917813cb7beee5e690c48c2ac65de4 Mon Sep 17 00:00:00 2001 +From: Xuanda Yang +Date: Wed, 9 Jun 2021 22:35:14 +0800 +Subject: [PATCH] codegen: replace deprecated llvm::VectorType::getNumElements + with new APIs (#41144) + +--- + src/llvm-late-gc-lowering.cpp | 29 ++++++++++++++++++++++++++--- + 1 file changed, 26 insertions(+), 3 deletions(-) + +diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp +index 50015045151b..4df303462d96 100644 +--- a/src/llvm-late-gc-lowering.cpp ++++ b/src/llvm-late-gc-lowering.cpp +@@ -396,8 +396,14 @@ CountTrackedPointers::CountTrackedPointers(Type *T) { + } + if (isa(T)) + count *= cast(T)->getNumElements(); +- else if (isa(T)) ++ else if (isa(T)) { ++#if JL_LLVM_VERSION >= 120000 ++ ElementCount EC = cast(T)->getElementCount(); ++ count *= EC.getKnownMinValue(); ++#else + count *= cast(T)->getNumElements(); ++#endif ++ } + } + if (count == 0) + all = false; +@@ -408,8 +414,14 @@ unsigned getCompositeNumElements(Type *T) { + return ST->getNumElements(); + else if (auto *AT = dyn_cast(T)) + return AT->getNumElements(); +- else ++ else { ++#if JL_LLVM_VERSION >= 120000 ++ ElementCount EC = cast(T)->getElementCount(); ++ return EC.getKnownMinValue(); ++#else + return cast(T)->getNumElements(); ++#endif ++ } + } + + // Walk through a Type, and record the element path to every tracked value inside +@@ -625,8 +637,14 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { + } + std::vector Numbers; + unsigned NumRoots = 1; +- if (auto VTy = dyn_cast(SI->getType())) ++ if (auto VTy = dyn_cast(SI->getType())) { ++#if JL_LLVM_VERSION >= 120000 ++ ElementCount EC = VTy->getElementCount(); ++ Numbers.resize(EC.getKnownMinValue(), -1); ++#else + Numbers.resize(VTy->getNumElements(), -1); ++#endif ++ } + else + assert(isa(SI->getType()) && "unimplemented"); + assert(!isTrackedValue(SI)); +@@ -686,7 +704,12 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { + assert(NumRoots == 1); + int Number = Numbers[0]; + Numbers.resize(0); ++#if JL_LLVM_VERSION >= 120000 ++ ElementCount EC = VTy->getElementCount(); ++ Numbers.resize(EC.getKnownMinValue(), Number); ++#else + Numbers.resize(VTy->getNumElements(), Number); ++#endif + } + } + if (!isa(SI->getType())) diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch new file mode 100644 index 000000000000..43b7925a9ce7 --- /dev/null +++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch @@ -0,0 +1,375 @@ +This patch is from: + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-llvm13.patch + +From 9daa25a5f331a7e1c0f0b222373a853c2ce1462d Mon Sep 17 00:00:00 2001 +From: Valentin Churavy +Date: Tue, 12 Oct 2021 11:56:19 -0400 +Subject: [PATCH 2/6] WIP: add Type to ByVal attribute + +--- + src/abi_aarch64.cpp | 2 +- + src/abi_arm.cpp | 2 +- + src/abi_llvm.cpp | 2 +- + src/abi_ppc64le.cpp | 6 +++++- + src/abi_win32.cpp | 6 +++++- + src/abi_win64.cpp | 9 +++++++-- + src/abi_x86.cpp | 8 ++++++-- + src/abi_x86_64.cpp | 11 ++++++++++- + src/ccall.cpp | 4 ++-- + 9 files changed, 38 insertions(+), 12 deletions(-) + +diff --git a/src/abi_aarch64.cpp b/src/abi_aarch64.cpp +index ce94cc66f0..7ffe107d61 100644 +--- a/src/abi_aarch64.cpp ++++ b/src/abi_aarch64.cpp +@@ -194,7 +194,7 @@ Type *isHFAorHVA(jl_datatype_t *dt, size_t &nele) const + return NULL; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + // B.2 + // If the argument type is an HFA or an HVA, then the argument is used +diff --git a/src/abi_arm.cpp b/src/abi_arm.cpp +index 1a5d3d0651..ed846dfafb 100644 +--- a/src/abi_arm.cpp ++++ b/src/abi_arm.cpp +@@ -23,7 +23,7 @@ + + struct ABI_ARMLayout : AbiLayout { + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + return false; + } +diff --git a/src/abi_llvm.cpp b/src/abi_llvm.cpp +index 1ab30da1b2..dba8f4aa8a 100644 +--- a/src/abi_llvm.cpp ++++ b/src/abi_llvm.cpp +@@ -45,7 +45,7 @@ bool use_sret(jl_datatype_t *ty) override + return false; + } + +-bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab, Type *Ty) override + { + return false; + } +diff --git a/src/abi_ppc64le.cpp b/src/abi_ppc64le.cpp +index dd6f927d9c..35e444ef77 100644 +--- a/src/abi_ppc64le.cpp ++++ b/src/abi_ppc64le.cpp +@@ -101,12 +101,16 @@ bool use_sret(jl_datatype_t *dt) override + return false; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + jl_datatype_t *ty0 = NULL; + bool hva = false; + if (jl_datatype_size(dt) > 64 && isHFA(dt, &ty0, &hva) > 8) { ++#if JL_LLVM_VERSION < 120000 + ab.addAttribute(Attribute::ByVal); ++#else ++ ab.addByValAttr(Ty); ++#endif + return true; + } + return false; +diff --git a/src/abi_win32.cpp b/src/abi_win32.cpp +index af16a0310b..0b34f840e4 100644 +--- a/src/abi_win32.cpp ++++ b/src/abi_win32.cpp +@@ -49,11 +49,15 @@ bool use_sret(jl_datatype_t *dt) override + return true; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + // Use pass by reference for all structs + if (dt->layout->nfields > 0) { ++#if JL_LLVM_VERSION < 120000 + ab.addAttribute(Attribute::ByVal); ++#else ++ ab.addByValAttr(Ty); ++#endif + return true; + } + return false; +diff --git a/src/abi_win64.cpp b/src/abi_win64.cpp +index 16e46a9703..f47802edf1 100644 +--- a/src/abi_win64.cpp ++++ b/src/abi_win64.cpp +@@ -56,14 +56,19 @@ bool use_sret(jl_datatype_t *dt) override + return true; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + nargs++; + size_t size = jl_datatype_size(dt); + if (win64_reg_size(size)) + return false; +- if (nargs <= 4) ++ if (nargs <= 4) { ++#if JL_LLVM_VERSION < 120000 + ab.addAttribute(Attribute::ByVal); ++#else ++ ab.addByValAttr(Ty); ++#endif ++ } + return true; + } + +diff --git a/src/abi_x86.cpp b/src/abi_x86.cpp +index 7a65de028e..c6c0282602 100644 +--- a/src/abi_x86.cpp ++++ b/src/abi_x86.cpp +@@ -67,12 +67,16 @@ bool use_sret(jl_datatype_t *dt) override + return true; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + size_t size = jl_datatype_size(dt); + if (is_complex64(dt) || is_complex128(dt) || (jl_is_primitivetype(dt) && size <= 8)) + return false; +- ab.addAttribute(Attribute::ByVal); ++#if JL_LLVM_VERSION < 120000 ++ ab.addAttribute(Attribute::ByVal); ++#else ++ ab.addByValAttr(Ty); ++#endif + return true; + } + +diff --git a/src/abi_x86_64.cpp b/src/abi_x86_64.cpp +index ac28af3011..5f8256dee4 100644 +--- a/src/abi_x86_64.cpp ++++ b/src/abi_x86_64.cpp +@@ -178,11 +178,15 @@ bool use_sret(jl_datatype_t *dt) override + return sret; + } + +-bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override ++bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override + { + Classification cl = classify(dt); + if (cl.isMemory) { ++#if JL_LLVM_VERSION < 120000 + ab.addAttribute(Attribute::ByVal); ++#else ++ ab.addByValAttr(Ty); ++#endif + return true; + } + +@@ -202,7 +206,12 @@ bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override + else if (jl_is_structtype(dt)) { + // spill to memory even though we would ordinarily pass + // it in registers ++#if JL_LLVM_VERSION < 120000 + ab.addAttribute(Attribute::ByVal); ++#else ++ Type* Ty = preferred_llvm_type(dt, false); ++ ab.addByValAttr(Ty); ++#endif + return true; + } + return false; +diff --git a/src/ccall.cpp b/src/ccall.cpp +index 66ab84c264..e21c717d41 100644 +--- a/src/ccall.cpp ++++ b/src/ccall.cpp +@@ -291,7 +291,7 @@ class AbiLayout { + public: + virtual ~AbiLayout() {} + virtual bool use_sret(jl_datatype_t *ty) = 0; +- virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&) = 0; ++ virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&, Type* llvm_t) = 0; + virtual Type *preferred_llvm_type(jl_datatype_t *ty, bool isret) const = 0; + }; + +@@ -1077,7 +1077,7 @@ std::string generate_func_sig(const char *fname) + } + + // Whether or not LLVM wants us to emit a pointer to the data +- bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab); ++ bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab, t); + + if (jl_is_cpointer_type(tti)) { + pat = t; + +From 1fe19a197ebbe33c9e60b2ca7d30c2573772b476 Mon Sep 17 00:00:00 2001 +From: Valentin Churavy +Date: Thu, 21 Oct 2021 20:32:39 -0400 +Subject: [PATCH 4/6] [LLVM/Win32] Force stack alignment on module + +--- + src/aotcompile.cpp | 3 +++ + src/ccall.cpp | 3 +++ + src/codegen.cpp | 11 ++++++++++- + 3 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp +index ffd43ee8d48d..d3dfc744fcd0 100644 +--- a/src/aotcompile.cpp ++++ b/src/aotcompile.cpp +@@ -550,6 +550,9 @@ void jl_dump_native_impl(void *native_code, + std::unique_ptr sysimage(new Module("sysimage", Context)); + sysimage->setTargetTriple(data->M->getTargetTriple()); + sysimage->setDataLayout(data->M->getDataLayout()); ++#if JL_LLVM_VERSION >= 130000 ++ sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment()); ++#endif + data->M.reset(); // free memory for data->M + + if (sysimg_data) { +diff --git a/src/ccall.cpp b/src/ccall.cpp +index fb70e53e2814..dd7626c918d0 100644 +--- a/src/ccall.cpp ++++ b/src/ccall.cpp +@@ -891,6 +891,9 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar + // copy module properties that should always match + Mod->setTargetTriple(jl_Module->getTargetTriple()); + Mod->setDataLayout(jl_Module->getDataLayout()); ++#if JL_LLVM_VERSION >= 130000 ++ Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment()); ++#endif + + // verify the definition + Function *def = Mod->getFunction(ir_name); +diff --git a/src/codegen.cpp b/src/codegen.cpp +index b09eb8db04e0..bc4ea7711a04 100644 +--- a/src/codegen.cpp ++++ b/src/codegen.cpp +@@ -1707,6 +1707,14 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default + llvm::DEBUG_METADATA_VERSION); + m->setDataLayout(jl_data_layout); + m->setTargetTriple(jl_TargetMachine->getTargetTriple().str()); ++ ++#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSIOn >= 130000 ++ // tell Win32 to assume the stack is always 16-byte aligned, ++ // and to ensure that it is 16-byte aligned for out-going calls, ++ // to ensure compatibility with GCC codes ++ m->setOverrideStackAlignment(16;) ++#endif ++ + } + + Module *jl_create_llvm_module(StringRef name) +@@ -8235,10 +8243,11 @@ extern "C" void jl_init_llvm(void) + + TargetOptions options = TargetOptions(); + //options.PrintMachineCode = true; //Print machine code produced during JIT compiling +-#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) ++#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSION <= 120000 + // tell Win32 to assume the stack is always 16-byte aligned, + // and to ensure that it is 16-byte aligned for out-going calls, + // to ensure compatibility with GCC codes ++ // In LLVM 13 and onwards this has turned into a module option + options.StackAlignmentOverride = 16; + #endif + #ifdef JL_DEBUG_BUILD + +From 7a320647976eb97fdd169b5e85397b9e493e4569 Mon Sep 17 00:00:00 2001 +From: Valentin Churavy +Date: Fri, 22 Oct 2021 15:35:38 -0400 +Subject: [PATCH 5/6] StackProtector is now a module flag + +--- + src/aotcompile.cpp | 1 + + src/ccall.cpp | 1 + + src/codegen.cpp | 6 ++++-- + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp +index d3dfc744fcd0..05fcca50c4ee 100644 +--- a/src/aotcompile.cpp ++++ b/src/aotcompile.cpp +@@ -551,6 +551,7 @@ void jl_dump_native_impl(void *native_code, + sysimage->setTargetTriple(data->M->getTargetTriple()); + sysimage->setDataLayout(data->M->getDataLayout()); + #if JL_LLVM_VERSION >= 130000 ++ sysimage->setStackProtectorGuard(data->M->getStackProtectorGuard()); + sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment()); + #endif + data->M.reset(); // free memory for data->M +diff --git a/src/ccall.cpp b/src/ccall.cpp +index dd7626c918d0..647735edb37d 100644 +--- a/src/ccall.cpp ++++ b/src/ccall.cpp +@@ -892,6 +892,7 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar + Mod->setTargetTriple(jl_Module->getTargetTriple()); + Mod->setDataLayout(jl_Module->getDataLayout()); + #if JL_LLVM_VERSION >= 130000 ++ Mod->setStackProtectorGuard(jl_Module->getStackProtectorGuard()); + Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment()); + #endif + +diff --git a/src/codegen.cpp b/src/codegen.cpp +index bc4ea7711a04..1a7017d3aeb7 100644 +--- a/src/codegen.cpp ++++ b/src/codegen.cpp +@@ -1714,7 +1714,9 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default + // to ensure compatibility with GCC codes + m->setOverrideStackAlignment(16;) + #endif +- ++#if defined(JL_DEBUG_BUILD) && JL_LLVM_VERSION >= 130000 ++ m->setStackProtectorGuard("global"); ++#endif + } + + Module *jl_create_llvm_module(StringRef name) + +From e323fc8f7be4ce053dec613076d7dd7517515134 Mon Sep 17 00:00:00 2001 +From: Valentin Churavy +Date: Sun, 24 Oct 2021 15:18:23 -0400 +Subject: [PATCH 6/6] Cleanup MachineObjectFileInfo handling in disassembly + +--- + src/disasm.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/disasm.cpp b/src/disasm.cpp +index 73b394b77d0b..25e7841bde85 100644 +--- a/src/disasm.cpp ++++ b/src/disasm.cpp +@@ -860,21 +860,21 @@ static void jl_dump_asm_internal( + std::unique_ptr MRI(TheTarget->createMCRegInfo(TheTriple.str())); + assert(MRI && "Unable to create target register info!"); + +- std::unique_ptr MOFI(new MCObjectFileInfo()); +-#if JL_LLVM_VERSION >= 130000 +- MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features); +- assert(MSTI && "Unable to create subtarget info!"); ++ std::unique_ptr STI( ++ TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features)); ++ assert(STI && "Unable to create subtarget info!"); + +- MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr); +- MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false); ++#if JL_LLVM_VERSION >= 130000 ++ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), STI.get(), &SrcMgr); ++ std::unique_ptr MOFI( ++ TheTarget->createMCObjectFileInfo(Ctx, /*PIC=*/false, /*LargeCodeModel=*/ false)); ++ Ctx.setObjectFileInfo(MOFI.get()); + #else ++ std::unique_ptr MOFI(new MCObjectFileInfo()); + MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); + MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx); + #endif + +- // Set up Subtarget and Disassembler +- std::unique_ptr +- STI(TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features)); + std::unique_ptr DisAsm(TheTarget->createMCDisassembler(*STI, Ctx)); + if (!DisAsm) { + rstream << "ERROR: no disassembler for target " << TheTriple.str(); diff --git a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch new file mode 100644 index 000000000000..0632a6e726f7 --- /dev/null +++ b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch @@ -0,0 +1,17 @@ +This pacth comes from + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch + +--- julia-1.3.0/Makefile.orig 2019-12-06 12:54:23.879790955 +0000 ++++ julia-1.3.0/Makefile 2019-12-06 12:54:36.329952953 +0000 +@@ -277,11 +277,6 @@ + + + install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html +-ifeq ($(BUNDLE_DEBUG_LIBS),1) +- @$(MAKE) $(QUIET_MAKE) all +-else +- @$(MAKE) $(QUIET_MAKE) release +-endif + @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \ + mkdir -p $(DESTDIR)$$subdir; \ + done diff --git a/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch deleted file mode 100644 index be7d20368f6d..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch +++ /dev/null @@ -1,72 +0,0 @@ -This pacth comes from: - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch - -diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -index a7ca666b23..b84a42f4e7 100644 ---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -@@ -31,9 +31,9 @@ elseif Sys.isapple() - const libmbedtls = "@rpath/libmbedtls.13.dylib" - const libmbedx509 = "@rpath/libmbedx509.1.dylib" - else -- const libmbedcrypto = "libmbedcrypto.so.5" -- const libmbedtls = "libmbedtls.so.13" -- const libmbedx509 = "libmbedx509.so.1" -+ const libmbedcrypto = "libmbedcrypto.so" -+ const libmbedtls = "libmbedtls.so" -+ const libmbedx509 = "libmbedx509.so" - end - - function __init__() -diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -index fa45e754e5..b51812e3a8 100644 ---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl -+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libLLVM = "@rpath/libLLVM.dylib" - else -- const libLLVM = "libLLVM-12jl.so" -+ const libLLVM = "libLLVM.so" - end - - function __init__() -diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -index 8b98c76ac5..77ad9e3800 100644 ---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl -+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libnghttp2 = "@rpath/libnghttp2.14.dylib" - else -- const libnghttp2 = "libnghttp2.so.14" -+ const libnghttp2 = "libnghttp2.so" - end - - function __init__() -diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -index f0d4b5dda6..2ed3017b51 100644 ---- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl -+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libgit2 = "@rpath/libgit2.1.1.dylib" - else -- const libgit2 = "libgit2.so.1.1" -+ const libgit2 = "libgit2.so" - end - - function __init__() -diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -index 215de8aed6..918d1ffdc2 100644 ---- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libopenlibm = "@rpath/libopenlibm.3.dylib" - else -- const libopenlibm = "libopenlibm.so.3" -+ const libopenlibm = "libopenlibm.so" - end - - function __init__() diff --git a/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch b/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch deleted file mode 100644 index f0abc7b8f60d..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch +++ /dev/null @@ -1,17 +0,0 @@ -This patch comes from - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch - -diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl -index 9ffcaa3646..5f571e7b26 100644 ---- a/stdlib/LibGit2/src/types.jl -+++ b/stdlib/LibGit2/src/types.jl -@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_ - push_update_reference::Ptr{Cvoid} = C_NULL - push_negotiation::Ptr{Cvoid} = C_NULL - transport::Ptr{Cvoid} = C_NULL -+ @static if LibGit2.VERSION >= v"1.2.0" -+ remote_ready::Ptr{Cvoid} = C_NULL -+ end - payload::Any = nothing - @static if LibGit2.VERSION >= v"0.99.0" - resolve_url::Ptr{Cvoid} = C_NULL diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch deleted file mode 100644 index 1398be7ec873..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch +++ /dev/null @@ -1,172 +0,0 @@ -This patch is from the julialang repository: - https://github.com/JuliaLang/julia/commit/677ce6d3.patch -but reference comes form ARCH Linux juia package - https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk - -From 677ce6d3adc2f70886f72795b0e5c739e75730ee Mon Sep 17 00:00:00 2001 -From: Valentin Churavy -Date: Sat, 28 Aug 2021 16:48:32 +0200 -Subject: [PATCH] [LLVM] Adapt to LLVM 13 changes - ---- - src/cgutils.cpp | 8 +++++++- - src/codegen.cpp | 2 +- - src/disasm.cpp | 8 ++++++++ - src/jitlayers.cpp | 7 +++++++ - src/llvm-late-gc-lowering.cpp | 5 +++-- - src/llvm-multiversioning.cpp | 5 +++++ - src/llvm-remove-addrspaces.cpp | 8 ++++++++ - 7 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/src/cgutils.cpp b/src/cgutils.cpp -index 4e9917b6b078..928e1a07b2f1 100644 ---- a/src/cgutils.cpp -+++ b/src/cgutils.cpp -@@ -2757,8 +2757,14 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt) - size_t nargs; - if (const auto *CC = dyn_cast(constant)) - nargs = CC->getNumOperands(); -- else if (const auto *CAZ = dyn_cast(constant)) -+ else if (const auto *CAZ = dyn_cast(constant)) { -+#if JL_LLVM_VERSION >= 130000 -+ // SVE: Elsewhere we use `getMinKownValue` -+ nargs = CAZ->getElementCount().getFixedValue(); -+#else - nargs = CAZ->getNumElements(); -+#endif -+ } - else if (const auto *CDS = dyn_cast(constant)) - nargs = CDS->getNumElements(); - else -diff --git a/src/codegen.cpp b/src/codegen.cpp -index 5cc9f66ffaef..9000513151fe 100644 ---- a/src/codegen.cpp -+++ b/src/codegen.cpp -@@ -7394,7 +7394,7 @@ static std::pair, jl_llvm_functions_t> - #endif - continue; - } -- assert(find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check -+ assert(std::find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check - TerminatorInst *terminator = FromBB->getTerminator(); - if (!terminator->getParent()->getUniqueSuccessor()) { - // Can't use `llvm::SplitCriticalEdge` here because -diff --git a/src/disasm.cpp b/src/disasm.cpp -index 6157873ad71c..589f618396ea 100644 ---- a/src/disasm.cpp -+++ b/src/disasm.cpp -@@ -857,8 +857,16 @@ static void jl_dump_asm_internal( - assert(MRI && "Unable to create target register info!"); - - std::unique_ptr MOFI(new MCObjectFileInfo()); -+#if JL_LLVM_VERSION >= 130000 -+ MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features); -+ assert(MSTI && "Unable to create subtarget info!"); -+ -+ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr); -+ MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false); -+#else - MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); - MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx); -+#endif - - // Set up Subtarget and Disassembler - std::unique_ptr -diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp -index 60b1903aaa80..12497cadf491 100644 ---- a/src/jitlayers.cpp -+++ b/src/jitlayers.cpp -@@ -10,6 +10,9 @@ - #include - #include - #include -+#if JL_LLVM_VERSION >= 130000 -+#include -+#endif - #include - #include - #include -@@ -654,7 +657,11 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM, LLVMContext *LLVMCtx) - MemMgr(createRTDyldMemoryManager()), - JuliaListener(CreateJuliaJITEventListener()), - TSCtx(std::unique_ptr(LLVMCtx)), -+#if JL_LLVM_VERSION >= 130000 -+ ES(cantFail(orc::SelfExecutorProcessControl::Create())), -+#else - ES(), -+#endif - GlobalJD(ES.createBareJITDylib("JuliaGlobals")), - JD(ES.createBareJITDylib("JuliaOJIT")), - ObjectLayer( -diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp -index 0aac7638be0d..db8b19bacea5 100644 ---- a/src/llvm-late-gc-lowering.cpp -+++ b/src/llvm-late-gc-lowering.cpp -@@ -709,7 +709,7 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - else - Numbers[i] = Number; - } -- if (auto VTy = dyn_cast(SI->getType())) { -+ if (auto VTy = dyn_cast(SI->getType())) { - if (NumRoots != Numbers.size()) { - // broadcast the scalar root number to fill the vector - assert(NumRoots == 1); -@@ -736,11 +736,12 @@ void LateLowerGCFrame::LiftPhi(State &S, PHINode *Phi) { - SmallVector lifted; - std::vector Numbers; - unsigned NumRoots = 1; -- if (auto VTy = dyn_cast(Phi->getType())) { -+ if (auto VTy = dyn_cast(Phi->getType())) { - NumRoots = VTy->getNumElements(); - Numbers.resize(NumRoots); - } - else { -+ // TODO: SVE - assert(isa(Phi->getType()) && "unimplemented"); - } - for (unsigned i = 0; i < NumRoots; ++i) { -diff --git a/src/llvm-multiversioning.cpp b/src/llvm-multiversioning.cpp -index 68081eb53d3a..a82600162fa9 100644 ---- a/src/llvm-multiversioning.cpp -+++ b/src/llvm-multiversioning.cpp -@@ -403,7 +403,12 @@ void CloneCtx::clone_function(Function *F, Function *new_f, ValueToValueMapTy &v - vmap[&*J] = &*DestI++; - } - SmallVector Returns; -+#if JL_LLVM_VERSION >= 130000 -+ // We are cloning into the same module -+ CloneFunctionInto(new_f, F, vmap, CloneFunctionChangeType::GlobalChanges, Returns); -+#else - CloneFunctionInto(new_f, F, vmap, true, Returns); -+#endif - } - - // Clone all clone_all targets. Makes sure that the base targets are all available. -diff --git a/src/llvm-remove-addrspaces.cpp b/src/llvm-remove-addrspaces.cpp -index ada10c8d5f1f..7c6ef093fbce 100644 ---- a/src/llvm-remove-addrspaces.cpp -+++ b/src/llvm-remove-addrspaces.cpp -@@ -345,7 +345,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) - for (auto MD : MDs) - NGV->addMetadata( - MD.first, -+#if JL_LLVM_VERSION >= 130000 -+ *MapMetadata(MD.second, VMap)); -+#else - *MapMetadata(MD.second, VMap, RF_MoveDistinctMDs)); -+#endif - - copyComdat(NGV, GV); - -@@ -372,7 +376,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) - NF, - F, - VMap, -+#if JL_LLVM_VERSION >= 130000 -+ CloneFunctionChangeType::GlobalChanges, -+#else - /*ModuleLevelChanges=*/true, -+#endif - Returns, - "", - nullptr, diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch deleted file mode 100644 index 5a8c2cde93d5..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch +++ /dev/null @@ -1,80 +0,0 @@ -This patch is from julialang repository: - https://github.com/JuliaLang/julia/commit/47f9139e.patch -but reference comes form ARCH Linux juia package - https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk - -From 47f9139e88917813cb7beee5e690c48c2ac65de4 Mon Sep 17 00:00:00 2001 -From: Xuanda Yang -Date: Wed, 9 Jun 2021 22:35:14 +0800 -Subject: [PATCH] codegen: replace deprecated llvm::VectorType::getNumElements - with new APIs (#41144) - ---- - src/llvm-late-gc-lowering.cpp | 29 ++++++++++++++++++++++++++--- - 1 file changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp -index 50015045151b..4df303462d96 100644 ---- a/src/llvm-late-gc-lowering.cpp -+++ b/src/llvm-late-gc-lowering.cpp -@@ -396,8 +396,14 @@ CountTrackedPointers::CountTrackedPointers(Type *T) { - } - if (isa(T)) - count *= cast(T)->getNumElements(); -- else if (isa(T)) -+ else if (isa(T)) { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = cast(T)->getElementCount(); -+ count *= EC.getKnownMinValue(); -+#else - count *= cast(T)->getNumElements(); -+#endif -+ } - } - if (count == 0) - all = false; -@@ -408,8 +414,14 @@ unsigned getCompositeNumElements(Type *T) { - return ST->getNumElements(); - else if (auto *AT = dyn_cast(T)) - return AT->getNumElements(); -- else -+ else { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = cast(T)->getElementCount(); -+ return EC.getKnownMinValue(); -+#else - return cast(T)->getNumElements(); -+#endif -+ } - } - - // Walk through a Type, and record the element path to every tracked value inside -@@ -625,8 +637,14 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - } - std::vector Numbers; - unsigned NumRoots = 1; -- if (auto VTy = dyn_cast(SI->getType())) -+ if (auto VTy = dyn_cast(SI->getType())) { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = VTy->getElementCount(); -+ Numbers.resize(EC.getKnownMinValue(), -1); -+#else - Numbers.resize(VTy->getNumElements(), -1); -+#endif -+ } - else - assert(isa(SI->getType()) && "unimplemented"); - assert(!isTrackedValue(SI)); -@@ -686,7 +704,12 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - assert(NumRoots == 1); - int Number = Numbers[0]; - Numbers.resize(0); -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = VTy->getElementCount(); -+ Numbers.resize(EC.getKnownMinValue(), Number); -+#else - Numbers.resize(VTy->getNumElements(), Number); -+#endif - } - } - if (!isa(SI->getType())) diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch b/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch deleted file mode 100644 index 43b7925a9ce7..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch +++ /dev/null @@ -1,375 +0,0 @@ -This patch is from: - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-llvm13.patch - -From 9daa25a5f331a7e1c0f0b222373a853c2ce1462d Mon Sep 17 00:00:00 2001 -From: Valentin Churavy -Date: Tue, 12 Oct 2021 11:56:19 -0400 -Subject: [PATCH 2/6] WIP: add Type to ByVal attribute - ---- - src/abi_aarch64.cpp | 2 +- - src/abi_arm.cpp | 2 +- - src/abi_llvm.cpp | 2 +- - src/abi_ppc64le.cpp | 6 +++++- - src/abi_win32.cpp | 6 +++++- - src/abi_win64.cpp | 9 +++++++-- - src/abi_x86.cpp | 8 ++++++-- - src/abi_x86_64.cpp | 11 ++++++++++- - src/ccall.cpp | 4 ++-- - 9 files changed, 38 insertions(+), 12 deletions(-) - -diff --git a/src/abi_aarch64.cpp b/src/abi_aarch64.cpp -index ce94cc66f0..7ffe107d61 100644 ---- a/src/abi_aarch64.cpp -+++ b/src/abi_aarch64.cpp -@@ -194,7 +194,7 @@ Type *isHFAorHVA(jl_datatype_t *dt, size_t &nele) const - return NULL; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - // B.2 - // If the argument type is an HFA or an HVA, then the argument is used -diff --git a/src/abi_arm.cpp b/src/abi_arm.cpp -index 1a5d3d0651..ed846dfafb 100644 ---- a/src/abi_arm.cpp -+++ b/src/abi_arm.cpp -@@ -23,7 +23,7 @@ - - struct ABI_ARMLayout : AbiLayout { - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - return false; - } -diff --git a/src/abi_llvm.cpp b/src/abi_llvm.cpp -index 1ab30da1b2..dba8f4aa8a 100644 ---- a/src/abi_llvm.cpp -+++ b/src/abi_llvm.cpp -@@ -45,7 +45,7 @@ bool use_sret(jl_datatype_t *ty) override - return false; - } - --bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab, Type *Ty) override - { - return false; - } -diff --git a/src/abi_ppc64le.cpp b/src/abi_ppc64le.cpp -index dd6f927d9c..35e444ef77 100644 ---- a/src/abi_ppc64le.cpp -+++ b/src/abi_ppc64le.cpp -@@ -101,12 +101,16 @@ bool use_sret(jl_datatype_t *dt) override - return false; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - jl_datatype_t *ty0 = NULL; - bool hva = false; - if (jl_datatype_size(dt) > 64 && isHFA(dt, &ty0, &hva) > 8) { -+#if JL_LLVM_VERSION < 120000 - ab.addAttribute(Attribute::ByVal); -+#else -+ ab.addByValAttr(Ty); -+#endif - return true; - } - return false; -diff --git a/src/abi_win32.cpp b/src/abi_win32.cpp -index af16a0310b..0b34f840e4 100644 ---- a/src/abi_win32.cpp -+++ b/src/abi_win32.cpp -@@ -49,11 +49,15 @@ bool use_sret(jl_datatype_t *dt) override - return true; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - // Use pass by reference for all structs - if (dt->layout->nfields > 0) { -+#if JL_LLVM_VERSION < 120000 - ab.addAttribute(Attribute::ByVal); -+#else -+ ab.addByValAttr(Ty); -+#endif - return true; - } - return false; -diff --git a/src/abi_win64.cpp b/src/abi_win64.cpp -index 16e46a9703..f47802edf1 100644 ---- a/src/abi_win64.cpp -+++ b/src/abi_win64.cpp -@@ -56,14 +56,19 @@ bool use_sret(jl_datatype_t *dt) override - return true; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - nargs++; - size_t size = jl_datatype_size(dt); - if (win64_reg_size(size)) - return false; -- if (nargs <= 4) -+ if (nargs <= 4) { -+#if JL_LLVM_VERSION < 120000 - ab.addAttribute(Attribute::ByVal); -+#else -+ ab.addByValAttr(Ty); -+#endif -+ } - return true; - } - -diff --git a/src/abi_x86.cpp b/src/abi_x86.cpp -index 7a65de028e..c6c0282602 100644 ---- a/src/abi_x86.cpp -+++ b/src/abi_x86.cpp -@@ -67,12 +67,16 @@ bool use_sret(jl_datatype_t *dt) override - return true; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - size_t size = jl_datatype_size(dt); - if (is_complex64(dt) || is_complex128(dt) || (jl_is_primitivetype(dt) && size <= 8)) - return false; -- ab.addAttribute(Attribute::ByVal); -+#if JL_LLVM_VERSION < 120000 -+ ab.addAttribute(Attribute::ByVal); -+#else -+ ab.addByValAttr(Ty); -+#endif - return true; - } - -diff --git a/src/abi_x86_64.cpp b/src/abi_x86_64.cpp -index ac28af3011..5f8256dee4 100644 ---- a/src/abi_x86_64.cpp -+++ b/src/abi_x86_64.cpp -@@ -178,11 +178,15 @@ bool use_sret(jl_datatype_t *dt) override - return sret; - } - --bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override -+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override - { - Classification cl = classify(dt); - if (cl.isMemory) { -+#if JL_LLVM_VERSION < 120000 - ab.addAttribute(Attribute::ByVal); -+#else -+ ab.addByValAttr(Ty); -+#endif - return true; - } - -@@ -202,7 +206,12 @@ bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override - else if (jl_is_structtype(dt)) { - // spill to memory even though we would ordinarily pass - // it in registers -+#if JL_LLVM_VERSION < 120000 - ab.addAttribute(Attribute::ByVal); -+#else -+ Type* Ty = preferred_llvm_type(dt, false); -+ ab.addByValAttr(Ty); -+#endif - return true; - } - return false; -diff --git a/src/ccall.cpp b/src/ccall.cpp -index 66ab84c264..e21c717d41 100644 ---- a/src/ccall.cpp -+++ b/src/ccall.cpp -@@ -291,7 +291,7 @@ class AbiLayout { - public: - virtual ~AbiLayout() {} - virtual bool use_sret(jl_datatype_t *ty) = 0; -- virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&) = 0; -+ virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&, Type* llvm_t) = 0; - virtual Type *preferred_llvm_type(jl_datatype_t *ty, bool isret) const = 0; - }; - -@@ -1077,7 +1077,7 @@ std::string generate_func_sig(const char *fname) - } - - // Whether or not LLVM wants us to emit a pointer to the data -- bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab); -+ bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab, t); - - if (jl_is_cpointer_type(tti)) { - pat = t; - -From 1fe19a197ebbe33c9e60b2ca7d30c2573772b476 Mon Sep 17 00:00:00 2001 -From: Valentin Churavy -Date: Thu, 21 Oct 2021 20:32:39 -0400 -Subject: [PATCH 4/6] [LLVM/Win32] Force stack alignment on module - ---- - src/aotcompile.cpp | 3 +++ - src/ccall.cpp | 3 +++ - src/codegen.cpp | 11 ++++++++++- - 3 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp -index ffd43ee8d48d..d3dfc744fcd0 100644 ---- a/src/aotcompile.cpp -+++ b/src/aotcompile.cpp -@@ -550,6 +550,9 @@ void jl_dump_native_impl(void *native_code, - std::unique_ptr sysimage(new Module("sysimage", Context)); - sysimage->setTargetTriple(data->M->getTargetTriple()); - sysimage->setDataLayout(data->M->getDataLayout()); -+#if JL_LLVM_VERSION >= 130000 -+ sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment()); -+#endif - data->M.reset(); // free memory for data->M - - if (sysimg_data) { -diff --git a/src/ccall.cpp b/src/ccall.cpp -index fb70e53e2814..dd7626c918d0 100644 ---- a/src/ccall.cpp -+++ b/src/ccall.cpp -@@ -891,6 +891,9 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar - // copy module properties that should always match - Mod->setTargetTriple(jl_Module->getTargetTriple()); - Mod->setDataLayout(jl_Module->getDataLayout()); -+#if JL_LLVM_VERSION >= 130000 -+ Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment()); -+#endif - - // verify the definition - Function *def = Mod->getFunction(ir_name); -diff --git a/src/codegen.cpp b/src/codegen.cpp -index b09eb8db04e0..bc4ea7711a04 100644 ---- a/src/codegen.cpp -+++ b/src/codegen.cpp -@@ -1707,6 +1707,14 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default - llvm::DEBUG_METADATA_VERSION); - m->setDataLayout(jl_data_layout); - m->setTargetTriple(jl_TargetMachine->getTargetTriple().str()); -+ -+#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSIOn >= 130000 -+ // tell Win32 to assume the stack is always 16-byte aligned, -+ // and to ensure that it is 16-byte aligned for out-going calls, -+ // to ensure compatibility with GCC codes -+ m->setOverrideStackAlignment(16;) -+#endif -+ - } - - Module *jl_create_llvm_module(StringRef name) -@@ -8235,10 +8243,11 @@ extern "C" void jl_init_llvm(void) - - TargetOptions options = TargetOptions(); - //options.PrintMachineCode = true; //Print machine code produced during JIT compiling --#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) -+#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSION <= 120000 - // tell Win32 to assume the stack is always 16-byte aligned, - // and to ensure that it is 16-byte aligned for out-going calls, - // to ensure compatibility with GCC codes -+ // In LLVM 13 and onwards this has turned into a module option - options.StackAlignmentOverride = 16; - #endif - #ifdef JL_DEBUG_BUILD - -From 7a320647976eb97fdd169b5e85397b9e493e4569 Mon Sep 17 00:00:00 2001 -From: Valentin Churavy -Date: Fri, 22 Oct 2021 15:35:38 -0400 -Subject: [PATCH 5/6] StackProtector is now a module flag - ---- - src/aotcompile.cpp | 1 + - src/ccall.cpp | 1 + - src/codegen.cpp | 6 ++++-- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp -index d3dfc744fcd0..05fcca50c4ee 100644 ---- a/src/aotcompile.cpp -+++ b/src/aotcompile.cpp -@@ -551,6 +551,7 @@ void jl_dump_native_impl(void *native_code, - sysimage->setTargetTriple(data->M->getTargetTriple()); - sysimage->setDataLayout(data->M->getDataLayout()); - #if JL_LLVM_VERSION >= 130000 -+ sysimage->setStackProtectorGuard(data->M->getStackProtectorGuard()); - sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment()); - #endif - data->M.reset(); // free memory for data->M -diff --git a/src/ccall.cpp b/src/ccall.cpp -index dd7626c918d0..647735edb37d 100644 ---- a/src/ccall.cpp -+++ b/src/ccall.cpp -@@ -892,6 +892,7 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar - Mod->setTargetTriple(jl_Module->getTargetTriple()); - Mod->setDataLayout(jl_Module->getDataLayout()); - #if JL_LLVM_VERSION >= 130000 -+ Mod->setStackProtectorGuard(jl_Module->getStackProtectorGuard()); - Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment()); - #endif - -diff --git a/src/codegen.cpp b/src/codegen.cpp -index bc4ea7711a04..1a7017d3aeb7 100644 ---- a/src/codegen.cpp -+++ b/src/codegen.cpp -@@ -1714,7 +1714,9 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default - // to ensure compatibility with GCC codes - m->setOverrideStackAlignment(16;) - #endif -- -+#if defined(JL_DEBUG_BUILD) && JL_LLVM_VERSION >= 130000 -+ m->setStackProtectorGuard("global"); -+#endif - } - - Module *jl_create_llvm_module(StringRef name) - -From e323fc8f7be4ce053dec613076d7dd7517515134 Mon Sep 17 00:00:00 2001 -From: Valentin Churavy -Date: Sun, 24 Oct 2021 15:18:23 -0400 -Subject: [PATCH 6/6] Cleanup MachineObjectFileInfo handling in disassembly - ---- - src/disasm.cpp | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/disasm.cpp b/src/disasm.cpp -index 73b394b77d0b..25e7841bde85 100644 ---- a/src/disasm.cpp -+++ b/src/disasm.cpp -@@ -860,21 +860,21 @@ static void jl_dump_asm_internal( - std::unique_ptr MRI(TheTarget->createMCRegInfo(TheTriple.str())); - assert(MRI && "Unable to create target register info!"); - -- std::unique_ptr MOFI(new MCObjectFileInfo()); --#if JL_LLVM_VERSION >= 130000 -- MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features); -- assert(MSTI && "Unable to create subtarget info!"); -+ std::unique_ptr STI( -+ TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features)); -+ assert(STI && "Unable to create subtarget info!"); - -- MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr); -- MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false); -+#if JL_LLVM_VERSION >= 130000 -+ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), STI.get(), &SrcMgr); -+ std::unique_ptr MOFI( -+ TheTarget->createMCObjectFileInfo(Ctx, /*PIC=*/false, /*LargeCodeModel=*/ false)); -+ Ctx.setObjectFileInfo(MOFI.get()); - #else -+ std::unique_ptr MOFI(new MCObjectFileInfo()); - MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); - MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx); - #endif - -- // Set up Subtarget and Disassembler -- std::unique_ptr -- STI(TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features)); - std::unique_ptr DisAsm(TheTarget->createMCDisassembler(*STI, Ctx)); - if (!DisAsm) { - rstream << "ERROR: no disassembler for target " << TheTriple.str(); diff --git a/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch b/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch deleted file mode 100644 index 0632a6e726f7..000000000000 --- a/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -This pacth comes from - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch - ---- julia-1.3.0/Makefile.orig 2019-12-06 12:54:23.879790955 +0000 -+++ julia-1.3.0/Makefile 2019-12-06 12:54:36.329952953 +0000 -@@ -277,11 +277,6 @@ - - - install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html --ifeq ($(BUNDLE_DEBUG_LIBS),1) -- @$(MAKE) $(QUIET_MAKE) all --else -- @$(MAKE) $(QUIET_MAKE) release --endif - @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \ - mkdir -p $(DESTDIR)$$subdir; \ - done diff --git a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch new file mode 100644 index 000000000000..be7d20368f6d --- /dev/null +++ b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch @@ -0,0 +1,72 @@ +This pacth comes from: + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch + +diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl +index a7ca666b23..b84a42f4e7 100644 +--- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl ++++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl +@@ -31,9 +31,9 @@ elseif Sys.isapple() + const libmbedtls = "@rpath/libmbedtls.13.dylib" + const libmbedx509 = "@rpath/libmbedx509.1.dylib" + else +- const libmbedcrypto = "libmbedcrypto.so.5" +- const libmbedtls = "libmbedtls.so.13" +- const libmbedx509 = "libmbedx509.so.1" ++ const libmbedcrypto = "libmbedcrypto.so" ++ const libmbedtls = "libmbedtls.so" ++ const libmbedx509 = "libmbedx509.so" + end + + function __init__() +diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl +index fa45e754e5..b51812e3a8 100644 +--- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl ++++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl +@@ -23,7 +23,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libLLVM = "@rpath/libLLVM.dylib" + else +- const libLLVM = "libLLVM-12jl.so" ++ const libLLVM = "libLLVM.so" + end + + function __init__() +diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl +index 8b98c76ac5..77ad9e3800 100644 +--- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl ++++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl +@@ -22,7 +22,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libnghttp2 = "@rpath/libnghttp2.14.dylib" + else +- const libnghttp2 = "libnghttp2.so.14" ++ const libnghttp2 = "libnghttp2.so" + end + + function __init__() +diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl +index f0d4b5dda6..2ed3017b51 100644 +--- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl ++++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl +@@ -23,7 +23,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libgit2 = "@rpath/libgit2.1.1.dylib" + else +- const libgit2 = "libgit2.so.1.1" ++ const libgit2 = "libgit2.so" + end + + function __init__() +diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl +index 215de8aed6..918d1ffdc2 100644 +--- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl ++++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl +@@ -22,7 +22,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libopenlibm = "@rpath/libopenlibm.3.dylib" + else +- const libopenlibm = "libopenlibm.so.3" ++ const libopenlibm = "libopenlibm.so" + end + + function __init__() diff --git a/dev-lang/julia/julia-1.6.5.ebuild b/dev-lang/julia/julia-1.6.5.ebuild index e7bcae84ca7a..534e938e4e3d 100644 --- a/dev-lang/julia/julia-1.6.5.ebuild +++ b/dev-lang/julia/julia-1.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -64,12 +64,12 @@ PATCHES=( "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch "${FILESDIR}/${PN}"-1.6.5-llvm_bad_perf_fix.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_3.patch "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch - "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch + "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch + "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch "${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch "${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch "${FILESDIR}/${PN}"-1.6.5-lazy_artifacts_fix.patch diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild index a66329f48d64..58f9de7db701 100644 --- a/dev-lang/julia/julia-1.7.1-r2.ebuild +++ b/dev-lang/julia/julia-1.7.1-r2.ebuild @@ -15,9 +15,9 @@ HOMEPAGE="https://julialang.org/" SRC_URI=" https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz - https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.0-llvm_13_compat_part_4.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.0-llvm_13_compat_part_5.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.0-llvm_13_compat_part_6.patch + https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch + https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch " LICENSE="MIT" @@ -62,14 +62,14 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch - "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_4.patch - "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_5.patch - "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_6.patch - "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch - "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch + "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch + "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch + "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch + "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch + "${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch ) -- cgit v1.2.3-65-gdbad