diff options
author | Matthias Maier <tamiko@gentoo.org> | 2022-06-06 00:15:57 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@gentoo.org> | 2022-06-06 00:16:53 -0500 |
commit | 5cbce21c37c1d2cc185709c7d327e34a9712df17 (patch) | |
tree | 6e251f852879d5de6c8c79625615a3428be24073 /dev-lang | |
parent | dev-lang/julia-bin: add 1.7.3 (diff) | |
download | gentoo-5cbce21c37c1d2cc185709c7d327e34a9712df17.tar.gz gentoo-5cbce21c37c1d2cc185709c7d327e34a9712df17.tar.bz2 gentoo-5cbce21c37c1d2cc185709c7d327e34a9712df17.zip |
dev-lang/julia: drop 1.6.5-r2
Closes: https://bugs.gentoo.org/840592
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/julia/Manifest | 1 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch | 15 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch | 20 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch | 30 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch | 375 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch | 35 | ||||
-rw-r--r-- | dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch | 33 | ||||
-rw-r--r-- | dev-lang/julia/julia-1.6.5-r2.ebuild | 184 |
8 files changed, 0 insertions, 693 deletions
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 012710241246..91f9e1fcc3fe 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,4 +1,3 @@ -DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc 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 diff --git a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch deleted file mode 100644 index 9cb75188b963..000000000000 --- a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/deps/llvm.mk 2019-02-09 10:09:30.102927517 +0300 -+++ b/deps/llvm.mk 2019-02-09 10:10:51.479924878 +0300 -@@ -464,10 +464,11 @@ - - $(build_prefix)/manifest/llvm: | $(llvm_python_workaround) - -+# unset DESTDIR to fix https://github.com/JuliaLang/julia/issues/23462 - LLVM_INSTALL = \ - cd $1 && mkdir -p $2$$(build_depsbindir) && \ - cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \ -- $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake -+ DESTDIR="" $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake - ifeq ($(OS), WINNT) - LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir) - endif diff --git a/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch deleted file mode 100644 index c0c05cc649a0..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile 2021-12-21 09:38:26.782829864 +0100 -+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 -@@ -336,7 +336,7 @@ - install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \ - done - endif --else ifneq (,$(findstring $(OS),Linux FreeBSD)) -+else ifneq (,$(findstring $(OS),FreeBSD)) - for j in $(JL_TARGETS) ; do \ - $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \ - done -@@ -357,7 +357,7 @@ - endif - - # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD --ifneq (,$(findstring $(OS),Linux FreeBSD)) -+ifneq (,$(findstring $(OS),FreeBSD)) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT) - ifeq ($(BUNDLE_DEBUG_LIBS),1) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT) diff --git a/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch b/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch deleted file mode 100644 index 9e0d5ecf1a32..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -Patch from -https://github.com/JuliaLang/julia/commit/d6a655bc.patch - Fix LazyArtifacts tests - -From d6a655bcfb610130626470e1aa5e2fc28a014b4a Mon Sep 17 00:00:00 2001 -From: Jameson Nash <vtjnash@gmail.com> -Date: Thu, 24 Dec 2020 00:29:37 -0500 -Subject: [PATCH] codegen: use new freeze intrinsics to avoid poison UB - (#38977) - -LLVM would likely be required to insert this anyways to make hoisting -legal (converting branches to and/or), so might as well add it -ourselves, so that users can legally write that code directly. ---- - src/intrinsics.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp -index ada6166c1ceb..b5160bbc39c0 100644 ---- a/src/intrinsics.cpp -+++ b/src/intrinsics.cpp -@@ -542,6 +542,8 @@ static jl_cgval_t generic_cast( - #endif - } - Value *ans = ctx.builder.CreateCast(Op, from, to); -+ if (f == fptosi || f == fptoui) -+ ans = ctx.builder.CreateFreeze(ans); - return mark_julia_type(ctx, ans, false, jlto); - } - 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 deleted file mode 100644 index 43b7925a9ce7..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-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 <v.churavy@gmail.com> -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 <v.churavy@gmail.com> -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<Module> 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 <v.churavy@gmail.com> -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 <v.churavy@gmail.com> -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<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TheTriple.str())); - assert(MRI && "Unable to create target register info!"); - -- std::unique_ptr<MCObjectFileInfo> 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<llvm::MCSubtargetInfo> 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<MCObjectFileInfo> MOFI( -+ TheTarget->createMCObjectFileInfo(Ctx, /*PIC=*/false, /*LargeCodeModel=*/ false)); -+ Ctx.setObjectFileInfo(MOFI.get()); - #else -+ std::unique_ptr<MCObjectFileInfo> 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<MCSubtargetInfo> -- STI(TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features)); - std::unique_ptr<MCDisassembler> 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-llvm_13_compat_part_4.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch deleted file mode 100644 index 839dd4ba39a0..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch from - https://github.com/JuliaLang/julia/commit/a2d85f6d.patch - - -From a2d85f6dc63439aea9f973bacb55006596fdb2b8 Mon Sep 17 00:00:00 2001 -From: Fangrui Song <i@maskray.me> -Date: Tue, 4 May 2021 11:53:40 -0700 -Subject: [PATCH] Replace llvm::sys::fs::F_None with llvm::sys::fs::OF_None - (#40666) - -The former is deprecated. -OF_None has been available in LLVM since 2018-06. ---- - src/codegen.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/codegen.cpp b/src/codegen.cpp -index ee5ec4dce0c1..bc60798220d5 100644 ---- a/src/codegen.cpp -+++ b/src/codegen.cpp -@@ -8092,12 +8092,12 @@ extern "C" void jl_dump_llvm_mfunction(void *v) - - extern void jl_write_bitcode_func(void *F, char *fname) { - std::error_code EC; -- raw_fd_ostream OS(fname, EC, sys::fs::F_None); -+ raw_fd_ostream OS(fname, EC, sys::fs::OF_None); - llvm::WriteBitcodeToFile(*((llvm::Function*)F)->getParent(), OS); - } - - extern void jl_write_bitcode_module(void *M, char *fname) { - std::error_code EC; -- raw_fd_ostream OS(fname, EC, sys::fs::F_None); -+ raw_fd_ostream OS(fname, EC, sys::fs::OF_None); - llvm::WriteBitcodeToFile(*(llvm::Module*)M, OS); - } diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch b/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch deleted file mode 100644 index f38c26bfd52e..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -Patch from - https://github.com/JuliaLang/julia/commit/7df16be0.patch -fixes bad performance with LLVM 12 - -From 7df16be0bfafee6d304ee0690366fa33845cc8d6 Mon Sep 17 00:00:00 2001 -From: Valentin Churavy <v.churavy@gmail.com> -Date: Wed, 12 May 2021 18:44:40 -0400 -Subject: [PATCH] [LLVM] add correlated value propagation after jump threading - ---- - src/aotcompile.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp -index db3f9f4b0e22..4cc22d127528 100644 ---- a/src/aotcompile.cpp -+++ b/src/aotcompile.cpp -@@ -692,6 +692,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level, - PM->add(createSROAPass()); - PM->add(createInstSimplifyLegacyPass()); - PM->add(createJumpThreadingPass()); -+ PM->add(createCorrelatedValuePropagationPass()); - - PM->add(createReassociatePass()); - -@@ -743,6 +744,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level, - // loops over Union-typed arrays to vectorize. - PM->add(createInstructionCombiningPass()); - PM->add(createJumpThreadingPass()); -+ PM->add(createCorrelatedValuePropagationPass()); - PM->add(createDeadStoreEliminationPass()); - - // More dead allocation (store) deletion before loop optimization diff --git a/dev-lang/julia/julia-1.6.5-r2.ebuild b/dev-lang/julia/julia-1.6.5-r2.ebuild deleted file mode 100644 index a2d6758f86d7..000000000000 --- a/dev-lang/julia/julia-1.6.5-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit llvm pax-utils toolchain-funcs - -# correct versions for stdlibs are in deps/checksums -# for everything else, run with network-sandbox and wait for the crash - -#MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9" -#MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e" -MY_LLVM_V="13.0.1" - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" - -SRC_URI=" - https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+system-llvm" - -RDEPEND=" - system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) -" -LLVM_MAX_SLOT=13 - -RDEPEND+=" - app-arch/p7zip - dev-libs/gmp:0= - dev-libs/libgit2:0 - >=dev-libs/libpcre2-10.23:0=[jit,unicode] - dev-libs/mpfr:0= - dev-libs/libutf8proc:0=[-cjk] - dev-util/patchelf - >=net-libs/mbedtls-2.2 - <net-misc/curl-7.81.0[http2,ssh] - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - >=sci-mathematics/dsfmt-2.2.4 - >=sys-libs/libunwind-1.1:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - dev-util/patchelf - virtual/pkgconfig - !system-llvm? ( dev-util/cmake )" - -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.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.6.5-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.6.5-libgit-1.4.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 -) - -pkg_setup() { - use system-llvm && llvm_pkg_setup -} - -src_unpack() { - local tounpack=(${A}) - # the main source tree, followed by deps - unpack "${tounpack[0]}" - - mkdir -p "${S}/deps/srccache/" - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - - sed -i \ - -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ - Make.inc || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." - - # julia does not play well with the system versions of libuv - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - LOCALBASE:="${EPREFIX}/usr" - override prefix:="${EPREFIX}/usr" - override libdir:="\$(prefix)/$(get_libdir)" - override CC:=$(tc-getCC) - override CXX:=$(tc-getCXX) - override AR:=$(tc-getAR) - - BUNDLE_DEBUG_LIBS:=0 - USE_BINARYBUILDER:=0 - USE_SYSTEM_CSL:=1 - USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) - USE_SYSTEM_LIBUNWIND:=1 - USE_SYSTEM_PCRE:=1 - USE_SYSTEM_LIBM:=0 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_DSFMT:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_LAPACK:=1 - USE_SYSTEM_GMP:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_SUITESPARSE:=1 - USE_SYSTEM_LIBUV:=0 - USE_SYSTEM_UTF8PROC:=1 - USE_SYSTEM_MBEDTLS:=1 - USE_SYSTEM_LIBSSH2:=1 - USE_SYSTEM_NGHTTP2:=1 - USE_SYSTEM_CURL:=1 - USE_SYSTEM_LIBGIT2:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_ZLIB:=1 - USE_SYSTEM_P7ZIP:=1 - VERBOSE:=1 - EOF -} - -src_compile() { - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - default - pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" -} - -src_install() { - emake install DESTDIR="${D}" - - if ! use system-llvm ; then - local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) - cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die - fi - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die - rmdir "${ED}"/usr/share/doc/julia || die - - # The appdata directory is deprecated. - mv "${ED}"/usr/share/{appdata,metainfo}/ || die -} - -pkg_postinst() { - elog "To use Plots, you will need to install sci-visualization/gr." -} |