diff options
| author | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-29 07:41:33 +0000 |
| commit | 80d8270d8488957f62fbf0df7a19dfe596be92ac (patch) | |
| tree | 6b2394742e803b1c2ab15fed9b4452d8eb1f2985 /library/sysroot | |
| parent | a5ee5cbad1dde83dde61959e9436716094e3408c (diff) | |
| parent | ecf2963baf17cead7c7c57c88eddac8696793dd8 (diff) | |
| download | rust-80d8270d8488957f62fbf0df7a19dfe596be92ac.tar.gz rust-80d8270d8488957f62fbf0df7a19dfe596be92ac.zip | |
Auto merge of #125016 - nicholasbishop:bishop-cb-112, r=tgross35
Update compiler_builtins to 0.1.114 The `weak-intrinsics` feature was removed from compiler_builtins in https://github.com/rust-lang/compiler-builtins/pull/598, so dropped the `compiler-builtins-weak-intrinsics` feature from alloc/std/sysroot. In https://github.com/rust-lang/compiler-builtins/pull/593, some builtins for f16/f128 were added. These don't work for all compiler backends, so add a `compiler-builtins-no-f16-f128` feature and disable it for cranelift and gcc.
Diffstat (limited to 'library/sysroot')
| -rw-r--r-- | library/sysroot/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/sysroot/Cargo.toml b/library/sysroot/Cargo.toml index 169eeeca8c2..7165c3e48af 100644 --- a/library/sysroot/Cargo.toml +++ b/library/sysroot/Cargo.toml @@ -16,8 +16,8 @@ backtrace = ["std/backtrace"] 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-no-f16-f128 = ["std/compiler-builtins-no-f16-f128"] 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"] |