Skip to content

Commit

Permalink
[RootFS] Use GCC 13+ for riscv64 (#401)
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@giordano
giordano authored Jan 5, 2025
1 parent 621fedb commit 4d0883a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 48 deletions.
44 changes: 0 additions & 44 deletions Artifacts.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1956,28 +1956,6 @@ os = "linux"
sha256 = "d49106316ef5a4dc8cbce8665e720526a921cbba89dc38be41d53fc65c18007f"
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"

[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "0e0e172850698ee5784355eebeaf661278cfc489"
lazy = true
libc = "musl"
os = "linux"

[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.squashfs".download]]
sha256 = "a51037a3b4eff64d08f63c48d16a5b873833d83a2085ac365cf11b0918c503cf"
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"

[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.unpacked"]]
arch = "x86_64"
git-tree-sha1 = "55460cf13be2ec9fe829768b49ea5b2ba49954ef"
lazy = true
libc = "musl"
os = "linux"

[["GCCBootstrap-riscv64-linux-gnu.v12.1.0.x86_64-linux-musl.unpacked".download]]
sha256 = "671879f013264f1627b5bff6ec246fd2806b4bc1ae9db74390df7004e00891d5"
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"

[["GCCBootstrap-riscv64-linux-gnu.v13.2.0.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "83e2aeef1b7ff0abe246d83065877e36f270bb32"
Expand All @@ -2000,28 +1978,6 @@ os = "linux"
sha256 = "fc2b0c57b83c22416cdab285b8e3efaa3c55988d1a771e2ade6308d6b24674f5"
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"

[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "0a988108fd945733a2b493ae398b67588abc0e32"
lazy = true
libc = "musl"
os = "linux"

[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.squashfs".download]]
sha256 = "2fe11e0f794df6af2ab39b8e6d1c4efc32cdb792fd045409cdcedd96d643a1c5"
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"

[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.unpacked"]]
arch = "x86_64"
git-tree-sha1 = "a10265906d9a12bbc7a2a9a6ed0a4d67cb6a3ad0"
lazy = true
libc = "musl"
os = "linux"

[["GCCBootstrap-riscv64-linux-musl.v12.1.0.x86_64-linux-musl.unpacked".download]]
sha256 = "d958a67682d30ea9e04116db4f463c17f0bf63823e352692d5fe7982da86e220"
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"

[["GCCBootstrap-riscv64-linux-musl.v13.2.0.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "fa8d3617b8a7a823076c43315b19eea746e61ea0"
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BinaryBuilderBase"
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
authors = ["Elliot Saba <[email protected]>"]
version = "1.34.1"
version = "1.34.2"

[deps]
Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
Expand Down
5 changes: 2 additions & 3 deletions src/Rootfs.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,10 +472,9 @@ function gcc_version(p::AbstractPlatform,
GCC_builds = filter(b -> getversion(b) ≥ v"7", GCC_builds)
end

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

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

2 comments on commit 4d0883a

@giordano
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/122427

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.34.2 -m "<description of version>" 4d0883a222bcb60871f8e24e56ef6e322502ec80
git push origin v1.34.2

Please sign in to comment.