diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-06-25 02:04:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-25 02:04:20 +0200 |
| commit | 2ed4368d2fa05d27cf86509b16d06a5402f7e111 (patch) | |
| tree | 89a528a50bda2220de1486daff817ab52245024c | |
| parent | 8630b1b3f4b4e41c485ec5f7e696a519d99f7295 (diff) | |
| parent | 4a9f292e5005fcb0174fe83a329f19d47da21f2d (diff) | |
| download | rust-2ed4368d2fa05d27cf86509b16d06a5402f7e111.tar.gz rust-2ed4368d2fa05d27cf86509b16d06a5402f7e111.zip | |
Rollup merge of #112956 - Amanieu:weak-intrinsics, r=Mark-Simulacrum
Expose `compiler-builtins-weak-intrinsics` feature for `-Zbuild-std` This was added in rust-lang/compiler-builtins#526 to force all compiler-builtins intrinsics to use weak linkage.
| -rw-r--r-- | library/alloc/Cargo.toml | 1 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 1 | ||||
| -rw-r--r-- | library/sysroot/Cargo.toml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index 95c07abf731..e5f828c4c0b 100644 --- a/library/alloc/Cargo.toml +++ b/library/alloc/Cargo.toml @@ -35,3 +35,4 @@ compiler-builtins-mem = ['compiler_builtins/mem'] compiler-builtins-c = ["compiler_builtins/c"] compiler-builtins-no-asm = ["compiler_builtins/no-asm"] compiler-builtins-mangled-names = ["compiler_builtins/mangled-names"] +compiler-builtins-weak-intrinsics = ["compiler_builtins/weak-intrinsics"] diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index aaaa88624f0..151809b2df5 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -65,6 +65,7 @@ compiler-builtins-c = ["alloc/compiler-builtins-c"] compiler-builtins-mem = ["alloc/compiler-builtins-mem"] compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"] compiler-builtins-mangled-names = ["alloc/compiler-builtins-mangled-names"] +compiler-builtins-weak-intrinsics = ["alloc/compiler-builtins-weak-intrinsics"] llvm-libunwind = ["unwind/llvm-libunwind"] system-llvm-libunwind = ["unwind/system-llvm-libunwind"] diff --git a/library/sysroot/Cargo.toml b/library/sysroot/Cargo.toml index 5356ee277cc..6ff24a8db59 100644 --- a/library/sysroot/Cargo.toml +++ b/library/sysroot/Cargo.toml @@ -17,6 +17,7 @@ compiler-builtins-c = ["std/compiler-builtins-c"] compiler-builtins-mem = ["std/compiler-builtins-mem"] compiler-builtins-no-asm = ["std/compiler-builtins-no-asm"] compiler-builtins-mangled-names = ["std/compiler-builtins-mangled-names"] +compiler-builtins-weak-intrinsics = ["std/compiler-builtins-weak-intrinsics"] llvm-libunwind = ["std/llvm-libunwind"] system-llvm-libunwind = ["std/system-llvm-libunwind"] panic-unwind = ["std/panic_unwind"] |