diff options
| author | bors <bors@rust-lang.org> | 2020-11-15 10:37:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-15 10:37:11 +0000 |
| commit | 04688459242356c0f6b9fdad3ba76c9ec4dcc354 (patch) | |
| tree | 32fafe1721bef0e7638cc093999a728869b80121 | |
| parent | 75042566d1c90d912f22e4db43b6d3af98447986 (diff) | |
| parent | 6de51252e05fe1859df5e8864149af8b721f41bd (diff) | |
| download | rust-04688459242356c0f6b9fdad3ba76c9ec4dcc354.tar.gz rust-04688459242356c0f6b9fdad3ba76c9ec4dcc354.zip | |
Auto merge of #78472 - hermitcore:builtins, r=Mark-Simulacrum
add options to use optimized and mangled compiler builtins In principle the compiler builtin features are also offered to alloc and std.
| -rw-r--r-- | library/alloc/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index 381750a5198..eff197d9988 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -31,3 +31,5 @@ harness = false [features] compiler-builtins-mem = ['compiler_builtins/mem'] compiler-builtins-c = ["compiler_builtins/c"] +compiler-builtins-asm = ["compiler_builtins/asm"] +compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"] diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 281ed4f336c..9444ba84f8c 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -60,6 +60,8 @@ panic-unwind = ["panic_unwind"] profiler = ["profiler_builtins"] compiler-builtins-c = ["alloc/compiler-builtins-c"] compiler-builtins-mem = ["alloc/compiler-builtins-mem"] +compiler-builtins-asm = ["alloc/compiler-builtins-asm"] +compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"] llvm-libunwind = ["unwind/llvm-libunwind"] system-llvm-libunwind = ["unwind/system-llvm-libunwind"] |