Skip to content

Commit 8b2ef5f

Browse files
Update compiler_builtins to 0.1.112
The `weak-intrinsics` feature was removed from compiler_builtins in rust-lang/compiler-builtins#598, so dropped the `compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot. In rust-lang/compiler-builtins#593, some builtins for f16/f128 were added. These don't work for all compiler backends, so add a `compiler-builtins-no-f16-f128` feature and disable it for cranelift and gcc.
1 parent 35c5e67 commit 8b2ef5f

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -771,9 +771,9 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
771771

772772
[[package]]
773773
name = "compiler_builtins"
774-
version = "0.1.109"
774+
version = "0.1.112"
775775
source = "registry+https://github.com/rust-lang/crates.io-index"
776-
checksum = "f11973008a8cf741fe6d22f339eba21fd0ca81e2760a769ba8243ed6c21edd7e"
776+
checksum = "b15acab2bb4fe4dad1f1e31f3d9e714f50ef561a0f87dd8a9da004f14d455e1a"
777777
dependencies = [
778778
"cc",
779779
"rustc-std-workspace-core",

compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ fn build_clif_sysroot_for_triple(
272272
if channel == "release" {
273273
build_cmd.arg("--release");
274274
}
275-
build_cmd.arg("--features").arg("compiler-builtins-no-asm backtrace panic-unwind");
275+
build_cmd
276+
.arg("--features")
277+
.arg("compiler-builtins-no-asm compiler-builtins-no-f16-f128 backtrace panic-unwind");
276278
build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true");
277279
build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
278280
if compiler.triple.contains("apple") {

compiler/rustc_codegen_gcc/build_system/src/build.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,14 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
112112
}
113113
let mut env = env.clone();
114114

115-
let mut args: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &"build", &"--target", &config.target];
115+
let mut args: Vec<&dyn AsRef<OsStr>> = vec![
116+
&"cargo",
117+
&"build",
118+
&"--target",
119+
&config.target,
120+
"--features",
121+
"compiler-builtins-no-f16-f128",
122+
];
116123

117124
if config.no_default_features {
118125
rustflags.push_str(" -Csymbol-mangling-version=v0");

library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ harness = false
3434
compiler-builtins-mem = ['compiler_builtins/mem']
3535
compiler-builtins-c = ["compiler_builtins/c"]
3636
compiler-builtins-no-asm = ["compiler_builtins/no-asm"]
37+
compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
3738
compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]
38-
compiler-builtins-weak-intrinsics = ["compiler_builtins/weak-intrinsics"]
3939
# Make panics and failed asserts immediately abort without formatting any message
4040
panic_immediate_abort = []

library/std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1717
panic_unwind = { path = "../panic_unwind", optional = true }
1818
panic_abort = { path = "../panic_abort" }
1919
core = { path = "../core", public = true }
20-
compiler_builtins = { version = "0.1.105" }
20+
compiler_builtins = { version = "0.1.112" }
2121
profiler_builtins = { path = "../profiler_builtins", optional = true }
2222
unwind = { path = "../unwind" }
2323
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
@@ -74,8 +74,8 @@ profiler = ["profiler_builtins"]
7474
compiler-builtins-c = ["alloc/compiler-builtins-c"]
7575
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
7676
compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
77+
compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
7778
compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
78-
compiler-builtins-weak-intrinsics = ["alloc/compiler-builtins-weak-intrinsics"]
7979
llvm-libunwind = ["unwind/llvm-libunwind"]
8080
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
8181

library/sysroot/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ backtrace = ["std/backtrace"]
1616
compiler-builtins-c = ["std/compiler-builtins-c"]
1717
compiler-builtins-mem = ["std/compiler-builtins-mem"]
1818
compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"]
19+
compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
1920
compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
20-
compiler-builtins-weak-intrinsics = ["std/compiler-builtins-weak-intrinsics"]
2121
llvm-libunwind = ["std/llvm-libunwind"]
2222
system-llvm-libunwind = ["std/system-llvm-libunwind"]
2323
panic-unwind = ["std/panic_unwind"]

0 commit comments

Comments
 (0)