Skip to content

Commit

Permalink
[libjulia] update to Julia 1.11.1; update 1.12.0-DEV version (#9660)
Browse files Browse the repository at this point in the history
libjulia: prefer llvm 17 to avoid: non-private labels cannot appear between .cfi_startproc / .cfi_endproc pairs

Co-authored-by: Benjamin Lorenz <[email protected]>
  • Loading branch information
fingolfin and benlorenz authored Oct 23, 2024
1 parent 84ccc3a commit 97dc75c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index db4007d320..e3448e2e2f 100644
(defined(__clang__) && __clang_major__ > 16)) && \
!defined(_CPU_PPC64_) && !defined(_CPU_PPC_) && \
+ !(defined(_CPU_X86_64_) && defined(_OS_DARWIN_)) && \
!defined(_OS_WINDOWS_)
!defined(_OS_WINDOWS_) && !defined(_CPU_RISCV64_)
#define BFLOAT16_TYPE __bf16
#define BFLOAT16_TO_UINT16(x) (*(uint16_t*)&(x))
--
Expand Down
17 changes: 9 additions & 8 deletions L/libjulia/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ using BinaryBuilder, Pkg
include("../../fancy_toys.jl") # for get_addable_spec

# list of supported Julia versions
julia_full_versions = [v"1.6.3", v"1.7.0", v"1.8.2", v"1.9.0", v"1.10.0", v"1.11.0-rc3", v"1.12.0-DEV"]
julia_full_versions = [v"1.6.3", v"1.7.0", v"1.8.2", v"1.9.0", v"1.10.0", v"1.11.1", v"1.12.0-DEV"]
if ! @isdefined julia_versions
julia_versions = Base.thispatch.(julia_full_versions)
end
Expand Down Expand Up @@ -54,12 +54,12 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
v"1.8.2" => "3e2cea35bf5df963ed7b75a83e8febfc000acf1e664ecd657a0772508eb1fb5d",
v"1.9.0" => "48f4c8a7d5f33d0bc6ce24226df20ab49e385c2d0c3767ec8dfdb449602095b2",
v"1.10.0" => "a4136608265c5d9186ae4767e94ddc948b19b43f760aba3501a161290852054d",
v"1.11.0-rc3" => "8f82f0dbbf5877f6af1c8de7d9d4ec0ea79ecc188c23fc281264a5fa963db5f0",
v"1.11.1" => "895549f40b21dee66b6380e30811f40d2d938c2baba0750de69c9a183cccd756",
)

if version == v"1.12.0-DEV"
sources = [
GitSource("https://github.com/JuliaLang/julia.git", "0622123121a33668f4dc771a6183b95fff533a53"),
GitSource("https://github.com/JuliaLang/julia.git", "e4101b71dbcd766b2e4f162320d1d64c0f03c6f3"),
DirectorySource("./bundled"),
]
else
Expand Down Expand Up @@ -436,11 +436,11 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
push!(dependencies, Dependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0"); platforms=filter(Sys.isapple, platforms)))
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"16.0.6+4")))
elseif version.major == 1 && version.minor == 12
push!(dependencies, BuildDependency(get_addable_spec("SuiteSparse_jll", v"7.8.0+0")))
push!(dependencies, Dependency(get_addable_spec("LibUV_jll", v"2.0.1+16")))
push!(dependencies, BuildDependency(get_addable_spec("SuiteSparse_jll", v"7.8.0+1")))
push!(dependencies, Dependency(get_addable_spec("LibUV_jll", v"2.0.1+19")))
push!(dependencies, Dependency(get_addable_spec("LibUnwind_jll", v"1.8.1+1"); platforms=filter(!Sys.isapple, platforms)))
push!(dependencies, Dependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0"); platforms=filter(Sys.isapple, platforms)))
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"18.1.7+2")))
push!(dependencies, Dependency(get_addable_spec("LLVMLibUnwind_jll", v"14.0.6+0"); platforms=filter(Sys.isapple, platforms)))
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"18.1.7+3")))
else
error("Unsupported Julia version")
end
Expand All @@ -450,6 +450,7 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)

if any(should_build_platform.(triplet.(platforms)))
build_tarballs(ARGS, name, jllversion, sources, script, platforms, products, dependencies;
preferred_gcc_version=gcc_ver, lock_microarchitecture=false, julia_compat="1.6")
preferred_gcc_version=gcc_ver, preferred_llvm_version=v"17",
lock_microarchitecture=false, julia_compat="1.6")
end
end

0 comments on commit 97dc75c

Please sign in to comment.