Skip to content

Commit c7c5adb

Browse files
committed
compiler-builtins: Remove the no-f16-f128 feature
This option was used to gate `f16` and `f128` when support across backends and targets was inconsistent. We now have the rustc builtin cfg `target_has_reliable{f16,f128}` which has taken over this usecase. Remove no-f16-f128 since it is now unused and redundant.
1 parent 08f833a commit c7c5adb

File tree

9 files changed

+4
-26
lines changed

9 files changed

+4
-26
lines changed

‎library/alloc/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features
2121
[features]
2222
compiler-builtins-mem = ['compiler_builtins/mem']
2323
compiler-builtins-c = ["compiler_builtins/c"]
24-
compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
2524
# Choose algorithms that are optimized for binary size instead of runtime performance
2625
optimize_for_size = ["core/optimize_for_size"]
2726

‎library/compiler-builtins/builtins-shim/Cargo.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ c = ["dep:cc"]
4747
# the generic versions on all platforms.
4848
no-asm = []
4949

50-
# Workaround for codegen backends which haven't yet implemented `f16` and
51-
# `f128` support. Disabled any intrinsics which use those types.
52-
no-f16-f128 = []
53-
5450
# Flag this library as the unstable compiler-builtins lib
5551
compiler-builtins = []
5652

‎library/compiler-builtins/builtins-test/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ utest-macros = { git = "https://github.com/japaric/utest" }
3333
default = ["mangled-names"]
3434
c = ["compiler_builtins/c"]
3535
no-asm = ["compiler_builtins/no-asm"]
36-
no-f16-f128 = ["compiler_builtins/no-f16-f128"]
3736
mem = ["compiler_builtins/mem"]
3837
mangled-names = ["compiler_builtins/mangled-names"]
3938
# Skip tests that rely on f128 symbols being available on the system

‎library/compiler-builtins/ci/run.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ else
3636
"${test_builtins[@]}" --features c --release
3737
"${test_builtins[@]}" --features no-asm
3838
"${test_builtins[@]}" --features no-asm --release
39-
"${test_builtins[@]}" --features no-f16-f128
40-
"${test_builtins[@]}" --features no-f16-f128 --release
4139
"${test_builtins[@]}" --benches
4240
"${test_builtins[@]}" --benches --release
4341

@@ -63,8 +61,6 @@ symcheck+=(-- build-and-check)
6361
"${symcheck[@]}" "$target" -- -p compiler_builtins --features c --release
6462
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm
6563
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm --release
66-
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128
67-
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128 --release
6864

6965
run_intrinsics_test() {
7066
build_args=(--verbose --manifest-path builtins-test-intrinsics/Cargo.toml)

‎library/compiler-builtins/compiler-builtins/Cargo.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ c = ["dep:cc"]
4545
# the generic versions on all platforms.
4646
no-asm = []
4747

48-
# Workaround for codegen backends which haven't yet implemented `f16` and
49-
# `f128` support. Disabled any intrinsics which use those types.
50-
no-f16-f128 = []
51-
5248
# Flag this library as the unstable compiler-builtins lib
5349
compiler-builtins = []
5450

‎library/compiler-builtins/compiler-builtins/configure.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,13 @@ pub fn configure_aliases(target: &Target) {
9595
* * https://github.com/rust-lang/rustc_codegen_cranelift/blob/c713ffab3c6e28ab4b4dd4e392330f786ea657ad/src/lib.rs#L196-L226
9696
*/
9797

98-
// If the feature is set, disable both of these types.
99-
let no_f16_f128 = target.cargo_features.iter().any(|s| s == "no-f16-f128");
100-
10198
println!("cargo::rustc-check-cfg=cfg(f16_enabled)");
102-
if target.reliable_f16 && !no_f16_f128 {
99+
if target.reliable_f16 {
103100
println!("cargo::rustc-cfg=f16_enabled");
104101
}
105102

106103
println!("cargo::rustc-check-cfg=cfg(f128_enabled)");
107-
if target.reliable_f128 && !no_f16_f128 {
104+
if target.reliable_f128 {
108105
println!("cargo::rustc-cfg=f128_enabled");
109106
}
110107
}

‎library/compiler-builtins/libm/configure.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,13 @@ fn emit_f16_f128_cfg(cfg: &Config) {
143143

144144
/* See the compiler-builtins configure file for info about the meaning of these options */
145145

146-
// If the feature is set, disable both of these types.
147-
let no_f16_f128 = cfg.cargo_features.iter().any(|s| s == "no-f16-f128");
148-
149146
println!("cargo:rustc-check-cfg=cfg(f16_enabled)");
150-
if cfg.reliable_f16 && !no_f16_f128 {
147+
if cfg.reliable_f16 {
151148
println!("cargo:rustc-cfg=f16_enabled");
152149
}
153150

154151
println!("cargo:rustc-check-cfg=cfg(f128_enabled)");
155-
if cfg.reliable_f128 && !no_f16_f128 {
152+
if cfg.reliable_f128 {
156153
println!("cargo:rustc-cfg=f128_enabled");
157154
}
158155
}

‎library/std/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ backtrace-trace-only = []
115115
panic-unwind = ["dep:panic_unwind"]
116116
compiler-builtins-c = ["alloc/compiler-builtins-c"]
117117
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
118-
compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
119118
llvm-libunwind = ["unwind/llvm-libunwind"]
120119
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
121120

‎library/sysroot/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ backtrace = ["std/backtrace"]
2525
backtrace-trace-only = ["std/backtrace-trace-only"]
2626
compiler-builtins-c = ["std/compiler-builtins-c"]
2727
compiler-builtins-mem = ["std/compiler-builtins-mem"]
28-
compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
2928
debug_refcell = ["std/debug_refcell"]
3029
llvm-libunwind = ["std/llvm-libunwind"]
3130
system-llvm-libunwind = ["std/system-llvm-libunwind"]

0 commit comments

Comments
 (0)