Skip to content

Commit 4d0883a

Browse files
authored
[RootFS] Use GCC 13+ for riscv64 (#401)
We've had a few problems with GCC 12 on riscv64 (missing `riscv_vector.h` header file, broken support for atomics) that we're often forced to use GCC 13. Let's always use GCC 13 at minimum and live happier. Once we get GCC 14 in we may bump the minimum riscv64 GCC toolchain to that version, because it introduces better support for the version 1.0 of the vector extension, important for OpenBLAS and other software.
1 parent 621fedb commit 4d0883a

File tree

3 files changed

+3
-48
lines changed

3 files changed

+3
-48
lines changed

Artifacts.toml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,28 +1956,6 @@ os = "linux"
19561956
sha256 = "d49106316ef5a4dc8cbce8665e720526a921cbba89dc38be41d53fc65c18007f"
19571957
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v9.1.0+2/GCCBootstrap-powerpc64le-linux-gnu.v9.1.0.x86_64-linux-musl.unpacked.tar.gz"
19581958

1959-
[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.squashfs"]]
1960-
arch = "x86_64"
1961-
git-tree-sha1 = "0e0e172850698ee5784355eebeaf661278cfc489"
1962-
lazy = true
1963-
libc = "musl"
1964-
os = "linux"
1965-
1966-
[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.squashfs".download]]
1967-
sha256 = "a51037a3b4eff64d08f63c48d16a5b873833d83a2085ac365cf11b0918c503cf"
1968-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v12.1.0/GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.squashfs.tar.gz"
1969-
1970-
[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.unpacked"]]
1971-
arch = "x86_64"
1972-
git-tree-sha1 = "55460cf13be2ec9fe829768b49ea5b2ba49954ef"
1973-
lazy = true
1974-
libc = "musl"
1975-
os = "linux"
1976-
1977-
[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.unpacked".download]]
1978-
sha256 = "671879f013264f1627b5bff6ec246fd2806b4bc1ae9db74390df7004e00891d5"
1979-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v12.1.0/GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.unpacked.tar.gz"
1980-
19811959
[["GCCBootstrap-riscv64-linux-gnu.v13.2.0.x86_64-linux-musl.squashfs"]]
19821960
arch = "x86_64"
19831961
git-tree-sha1 = "83e2aeef1b7ff0abe246d83065877e36f270bb32"
@@ -2000,28 +1978,6 @@ os = "linux"
20001978
sha256 = "fc2b0c57b83c22416cdab285b8e3efaa3c55988d1a771e2ade6308d6b24674f5"
20011979
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v13.2.0/GCCBootstrap-riscv64-linux-gnu.v13.2.0.x86_64-linux-musl.unpacked.tar.gz"
20021980

2003-
[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.squashfs"]]
2004-
arch = "x86_64"
2005-
git-tree-sha1 = "0a988108fd945733a2b493ae398b67588abc0e32"
2006-
lazy = true
2007-
libc = "musl"
2008-
os = "linux"
2009-
2010-
[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.squashfs".download]]
2011-
sha256 = "2fe11e0f794df6af2ab39b8e6d1c4efc32cdb792fd045409cdcedd96d643a1c5"
2012-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v12.1.0/GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.squashfs.tar.gz"
2013-
2014-
[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.unpacked"]]
2015-
arch = "x86_64"
2016-
git-tree-sha1 = "a10265906d9a12bbc7a2a9a6ed0a4d67cb6a3ad0"
2017-
lazy = true
2018-
libc = "musl"
2019-
os = "linux"
2020-
2021-
[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.unpacked".download]]
2022-
sha256 = "d958a67682d30ea9e04116db4f463c17f0bf63823e352692d5fe7982da86e220"
2023-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GCCBootstrap-v12.1.0/GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.unpacked.tar.gz"
2024-
20251981
[["GCCBootstrap-riscv64-linux-musl.v13.2.0.x86_64-linux-musl.squashfs"]]
20261982
arch = "x86_64"
20271983
git-tree-sha1 = "fa8d3617b8a7a823076c43315b19eea746e61ea0"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BinaryBuilderBase"
22
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
33
authors = ["Elliot Saba <staticfloat@gmail.com>"]
4-
version = "1.34.1"
4+
version = "1.34.2"
55

66
[deps]
77
Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"

src/Rootfs.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,9 @@ function gcc_version(p::AbstractPlatform,
472472
GCC_builds = filter(b -> getversion(b) v"7", GCC_builds)
473473
end
474474

475-
# We only have GCC 12 or newer for RISC-V.
476-
# (This could be changed down to GCC 7.1.)
475+
# We only have GCC 13 or newer for RISC-V.
477476
if arch(p) == "riscv64"
478-
GCC_builds = filter(b -> getversion(b) v"12", GCC_builds)
477+
GCC_builds = filter(b -> getversion(b) v"13", GCC_builds)
479478
end
480479

481480
# Rust on Windows requires binutils 2.25 (it invokes `ld` with `--high-entropy-va`),

0 commit comments

Comments
 (0)