Auto merge of rust-lang#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: rust-lang#128533
rust-lang-ci · Oct 31, 2024 · 24254ef · 24254ef
2 parents a0d98ff + 72159f8
commit 24254ef
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/library/Cargo.lock b/library/Cargo.lock
@@ -61,9 +61,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.134"
+version = "0.1.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f743e6f7410a78c261505c729f389583de40eec62332cc8cdf2c8b9bf73049a"
+checksum = "33ccee9dd499d7ada4c81533382ce87e88c52b0676c7320b2e617d29e1bb3a3f"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",

diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 core = { path = "../core" }
-compiler_builtins = { version = "0.1.134", features = ['rustc-dep-of-std'] }
+compiler_builtins = { version = "0.1.136", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
 rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -17,7 +17,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
 panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core", public = true }
-compiler_builtins = { version = "0.1.134" }
+compiler_builtins = { version = "0.1.136" }
 unwind = { path = "../unwind" }
 hashbrown = { version = "0.15", default-features = false, features = [
     'rustc-dep-of-std',

diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
@@ -24,6 +24,7 @@ const LICENSES: &[&str] = &[
     "BSD-2-Clause OR Apache-2.0 OR MIT",                   // zerocopy
     "ISC",
     "MIT / Apache-2.0",
+    "MIT AND Apache-2.0 WITH LLVM-exception AND (MIT OR Apache-2.0)", // compiler-builtins
     "MIT OR Apache-2.0 OR LGPL-2.1-or-later",              // r-efi, r-efi-alloc
     "MIT OR Apache-2.0 OR Zlib",                           // tinyvec_macros
     "MIT OR Apache-2.0",