Skip to content

Commit 24254ef

Browse files
committed
Auto merge of #132206 - tgross35:update-builtins, r=wesleywiser
Update compiler-builtins to 0.1.136 This includes: * The license change rust-lang/compiler-builtins#717 * The `libm` submodule update, which also has a license change rust-lang/libm#317 * Re-enabling `math` on i686 UEFI rust-lang/compiler-builtins#715 Fixes: #128533
2 parents a0d98ff + 72159f8 commit 24254ef

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

library/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ dependencies = [
6161

6262
[[package]]
6363
name = "compiler_builtins"
64-
version = "0.1.134"
64+
version = "0.1.136"
6565
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "2f743e6f7410a78c261505c729f389583de40eec62332cc8cdf2c8b9bf73049a"
66+
checksum = "33ccee9dd499d7ada4c81533382ce87e88c52b0676c7320b2e617d29e1bb3a3f"
6767
dependencies = [
6868
"cc",
6969
"rustc-std-workspace-core",

library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }
13-
compiler_builtins = { version = "0.1.134", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "0.1.136", features = ['rustc-dep-of-std'] }
1414

1515
[dev-dependencies]
1616
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
1717
panic_unwind = { path = "../panic_unwind", optional = true }
1818
panic_abort = { path = "../panic_abort" }
1919
core = { path = "../core", public = true }
20-
compiler_builtins = { version = "0.1.134" }
20+
compiler_builtins = { version = "0.1.136" }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.15", default-features = false, features = [
2323
'rustc-dep-of-std',

src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const LICENSES: &[&str] = &[
2424
"BSD-2-Clause OR Apache-2.0 OR MIT", // zerocopy
2525
"ISC",
2626
"MIT / Apache-2.0",
27+
"MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)", // compiler-builtins
2728
"MIT OR Apache-2.0 OR LGPL-2.1-or-later", // r-efi, r-efi-alloc
2829
"MIT OR Apache-2.0 OR Zlib", // tinyvec_macros
2930
"MIT OR Apache-2.0",

0 commit comments

Comments
 (0)