Skip to content

Commit 1e888ed

Browse files
authored
Rollup merge of #144471 - tgross35:compiler-builtins-asm, r=Amanieu
Remove `compiler-builtins-{no-asm,mangled-names}` Remove `compiler-builtins-no-asm` This feature used to be for when Cranelift didn't support inline assembly, but its last uses were removed in 52933e0 ("Don't disable inline asm usage in compiler-builtins when the cranelift backend is enabled"). and cba05a7 ("Support naked functions"). This doesn't remove the feature from the `compiler-builtins` crate, that will be done separately in the subtree repo. --- Remove `compiler-builtins-mangled-names` This config was added in 207de01 ("libary: Forward compiler-builtins "asm" and "mangled-names" feature") but it does not appear this has ever been used. The PR adding it (#78472) says that this was exposed to help with configuration and points at the [Hermit Cargo config], but as far as I can tell, this feature name has never been mentioned in that repository's git history. Thus, clean up a seemingly unneeded feature. [Hermit Cargo config]: https://github.com/hermit-os/hermit-rs/blob/ab2b830930e6a9a98c8294997a8183feeabeda4a/.cargo/config
2 parents 6bd3273 + 51c5f19 commit 1e888ed

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

library/alloc/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ 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-asm = ["compiler_builtins/no-asm"]
2524
compiler-builtins-no-f16-f128 = ["compiler_builtins/no-f16-f128"]
26-
compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"]
2725
# Make panics and failed asserts immediately abort without formatting any message
2826
panic_immediate_abort = ["core/panic_immediate_abort"]
2927
# Choose algorithms that are optimized for binary size instead of runtime performance

library/std/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ backtrace-trace-only = []
9797
panic-unwind = ["dep:panic_unwind"]
9898
compiler-builtins-c = ["alloc/compiler-builtins-c"]
9999
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
100-
compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]
101100
compiler-builtins-no-f16-f128 = ["alloc/compiler-builtins-no-f16-f128"]
102-
compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"]
103101
llvm-libunwind = ["unwind/llvm-libunwind"]
104102
system-llvm-libunwind = ["unwind/system-llvm-libunwind"]
105103

library/sysroot/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ backtrace = ["std/backtrace"]
2323
backtrace-trace-only = ["std/backtrace-trace-only"]
2424
compiler-builtins-c = ["std/compiler-builtins-c"]
2525
compiler-builtins-mem = ["std/compiler-builtins-mem"]
26-
compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"]
2726
compiler-builtins-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"]
28-
compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"]
2927
debug_refcell = ["std/debug_refcell"]
3028
llvm-libunwind = ["std/llvm-libunwind"]
3129
system-llvm-libunwind = ["std/system-llvm-libunwind"]

0 commit comments

Comments
 (0)