Skip to content

Commit

Permalink
Auto merge of rust-lang#132206 - tgross35:update-builtins, r=wesleywiser
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Oct 31, 2024
2 parents 5d892fb + 3cfffb8 commit 36cfa4e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion alloc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 36cfa4e

Please sign in to comment.