From 69970efef81146209f76b231ed478b095a9fa971 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Fri, 23 Jun 2023 11:15:34 +0100 Subject: [PATCH] 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. --- alloc/Cargo.toml | 1 + std/Cargo.toml | 1 + sysroot/Cargo.toml | 1 + 3 files changed, 3 insertions(+) diff --git a/alloc/Cargo.toml b/alloc/Cargo.toml index 95c07abf7..e5f828c4c 100644 --- a/alloc/Cargo.toml +++ b/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/std/Cargo.toml b/std/Cargo.toml index af74efa6b..c3447b4cc 100644 --- a/std/Cargo.toml +++ b/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/sysroot/Cargo.toml b/sysroot/Cargo.toml index 5356ee277..6ff24a8db 100644 --- a/sysroot/Cargo.toml +++ b/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"]