diff --git a/L/libjulia/build_tarballs.jl b/L/libjulia/build_tarballs.jl index 2b9a0d33594..b5acddf223a 100644 --- a/L/libjulia/build_tarballs.jl +++ b/L/libjulia/build_tarballs.jl @@ -1,5 +1,6 @@ include("common.jl") -jllversion=v"1.7.1" +jllversion=v"1.8.0" build_julia(ARGS, v"1.6.3"; jllversion) build_julia(ARGS, v"1.7.0"; jllversion) build_julia(ARGS, v"1.8.0-DEV"; jllversion) +build_julia(ARGS, v"1.9.0-DEV"; jllversion) diff --git a/L/libjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch b/L/libjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch deleted file mode 100644 index 698dc906729..00000000000 --- a/L/libjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd925de72b46a1982cb5515c2e90d67b1744f0bf Mon Sep 17 00:00:00 2001 -From: Max Horn -Date: Sun, 26 Dec 2021 17:28:46 +0100 -Subject: [PATCH] Don't set HAVE_SSP unconditionally on aarch64 - -There is no plausible reason for this. And indeed, this patch fixes -compilation for the libjulia_jll builder on Yggdrasil which currently fails -due to the absence of libssp. - -The removed line was introduced in PR #41936 but without any justification -that I could discern, so it might have just slipped in there accidentally. ---- - Make.inc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Make.inc b/Make.inc -index 9706b1f929..b73d9033ca 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -891,7 +891,6 @@ OPENBLAS_DYNAMIC_ARCH:=0 - OPENBLAS_TARGET_ARCH:=ARMV8 - USE_BLAS64:=1 - BINARY:=64 --HAVE_SSP:=1 - ifeq ($(OS),Darwin) - # Apple Chips are all at least A12Z - MCPU:=apple-a12 --- -2.34.0.7.g0ea906d205 - diff --git a/L/libjulia/bundled/patches/1.8.0-DEV/debuginfo-32-bit-arm.patch b/L/libjulia/bundled/patches/1.8.0-DEV/debuginfo-32-bit-arm.patch new file mode 100644 index 00000000000..bbcdcf4caf3 --- /dev/null +++ b/L/libjulia/bundled/patches/1.8.0-DEV/debuginfo-32-bit-arm.patch @@ -0,0 +1,26 @@ +From c9ac2eadfb2c80ddd2cff30c5eaec0f4e8695167 Mon Sep 17 00:00:00 2001 +From: David Nadlinger +Date: Sat, 19 Feb 2022 20:31:41 +0000 +Subject: [PATCH] debuginfo: Fix build on 32-bit ARM + +This slipped through in 955d4271, as we aren't building for +32 bit ARM during CI right now. + +GitHub: Fixes #44254. +--- + src/debuginfo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp +index 42d67bd6f89c..53105feb81bf 100644 +--- a/src/debuginfo.cpp ++++ b/src/debuginfo.cpp +@@ -227,7 +227,7 @@ class JITObjectRegistry + continue; + } + } +- uint64_t loadaddr = L.getSectionLoadAddress(section); ++ uint64_t loadaddr = getLoadAddress(section.getName().get()); + size_t seclen = section.getSize(); + if (istext) { + arm_text_addr = loadaddr; diff --git a/L/libjulia/bundled/patches/1.9.0-DEV/debuginfo-32-bit-arm.patch b/L/libjulia/bundled/patches/1.9.0-DEV/debuginfo-32-bit-arm.patch new file mode 100644 index 00000000000..bbcdcf4caf3 --- /dev/null +++ b/L/libjulia/bundled/patches/1.9.0-DEV/debuginfo-32-bit-arm.patch @@ -0,0 +1,26 @@ +From c9ac2eadfb2c80ddd2cff30c5eaec0f4e8695167 Mon Sep 17 00:00:00 2001 +From: David Nadlinger +Date: Sat, 19 Feb 2022 20:31:41 +0000 +Subject: [PATCH] debuginfo: Fix build on 32-bit ARM + +This slipped through in 955d4271, as we aren't building for +32 bit ARM during CI right now. + +GitHub: Fixes #44254. +--- + src/debuginfo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp +index 42d67bd6f89c..53105feb81bf 100644 +--- a/src/debuginfo.cpp ++++ b/src/debuginfo.cpp +@@ -227,7 +227,7 @@ class JITObjectRegistry + continue; + } + } +- uint64_t loadaddr = L.getSectionLoadAddress(section); ++ uint64_t loadaddr = getLoadAddress(section.getName().get()); + size_t seclen = section.getSize(); + if (istext) { + arm_text_addr = loadaddr; diff --git a/L/libjulia/common.jl b/L/libjulia/common.jl index 7b605d1344e..c3aef435675 100644 --- a/L/libjulia/common.jl +++ b/L/libjulia/common.jl @@ -44,7 +44,12 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) if version == v"1.8.0-DEV" sources = [ - GitSource("https://github.com/JuliaLang/julia.git", "00646634c6a73998eaae3785eb78fea881c39502"), + GitSource("https://github.com/JuliaLang/julia.git", "7a1c20e6dea50291b364452996d3d4d71a6133dc"), + DirectorySource("./bundled"), + ] + elseif version == v"1.9.0-DEV" + sources = [ + GitSource("https://github.com/JuliaLang/julia.git", "6409a8a8ebe8a6d648ad1739e7ac589721646e2d"), DirectorySource("./bundled"), ] else @@ -130,7 +135,13 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) # -NDEBUG below fixes the FreeBSD build of Julia 1.4 and 1.5 CXXFLAGS="-I${prefix}/include -DNDEBUG" if [[ "${target}" == *mingw* ]]; then - LLVMLINK="-L${prefix}/bin -lLLVM" + if [[ "${version}" == 1.8.* ]]; then + LLVMLINK="-L${prefix}/bin -lLLVM-13jl" + elif [[ "${version}" == 1.9.* ]]; then + LLVMLINK="-L${prefix}/bin -lLLVM-13jl" + else + LLVMLINK="-L${prefix}/bin -lLLVM" + fi LLVM_LDFLAGS="-L${prefix}/bin" LDFLAGS="-L${prefix}/bin" elif [[ "${target}" == *apple* ]]; then @@ -141,7 +152,9 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) elif [[ "${version}" == 1.7.* ]]; then LLVMLINK="-L${prefix}/lib -lLLVM-12jl" elif [[ "${version}" == 1.8.* ]]; then - LLVMLINK="-L${prefix}/lib -lLLVM-12jl" + LLVMLINK="-L${prefix}/lib -lLLVM-13jl" + elif [[ "${version}" == 1.9.* ]]; then + LLVMLINK="-L${prefix}/lib -lLLVM-13jl" else echo "Error, LLVM version not specified" exit 1 @@ -323,7 +336,10 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"12.0.1+3"))) push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"11.0.1+1"))) elseif version.major == 1 && version.minor == 8 - push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"12.0.1+4"))) + push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.0+3"))) + push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0"))) + elseif version.major == 1 && version.minor == 9 + push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.1+0"))) push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0"))) else error("Unsupported Julia version")