diff options
| author | Daniel Sommermann <dcsommer@gmail.com> | 2022-01-28 09:28:06 -0800 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-02-21 21:06:39 -0500 |
| commit | e17e4669e5413a542257aa0b9f93bd64e85e3053 (patch) | |
| tree | af0afda574ca5eb3960d0e333055940b9408c562 | |
| parent | 41048133f325fbe9b90fca3e9cfe6b0857d9fe89 (diff) | |
| download | rust-e17e4669e5413a542257aa0b9f93bd64e85e3053.tar.gz rust-e17e4669e5413a542257aa0b9f93bd64e85e3053.zip | |
Update compiler_builtins to fix duplicate symbols in `armv7-linux-androideabi` rlib
I ran `./x.py dist --host= --target=armv7-linux-androideabi` before this diff: ``` $ nm build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-3d9661a82c59c66a.rlib 2> /dev/null | grep __sync_fetch_and_add_4 | wc -l 2 ``` And after: ``` $ nm build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/armv7-linux-androideabi/lib/libcompiler_builtins-ffd2745070943321.rlib 2> /dev/null | grep __sync_fetch_and_add_4 | wc -l 1 ``` Fixes #93310
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2abf190a5ea..51d937d4dc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.66" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191424db7756bbed2c4996959a0fbda94388abcf4f5a2728a8af17481ad9c4f7" +checksum = "a68c69e9451f1df4b215c9588c621670c12286b53e60fb5ec4b59aaa1138d18e" dependencies = [ "cc", "rustc-std-workspace-core", diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 232ccdf39d4..bf540049642 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true } panic_abort = { path = "../panic_abort" } core = { path = "../core" } libc = { version = "0.2.108", default-features = false, features = ['rustc-dep-of-std'] } -compiler_builtins = { version = "0.1.66" } +compiler_builtins = { version = "0.1.67" } profiler_builtins = { path = "../profiler_builtins", optional = true } unwind = { path = "../unwind" } hashbrown = { version = "0.11", default-features = false, features = ['rustc-dep-of-std'] } |