Skip to content

Commit fe62a2f

Browse files
authored
Rollup merge of #93436 - dcsommer:master, r=Mark-Simulacrum
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 See also rust-lang/compiler-builtins#449 and rust-lang/compiler-builtins#450
2 parents 2c3e750 + 746b3d8 commit fe62a2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -761,9 +761,9 @@ dependencies = [
761761

762762
[[package]]
763763
name = "compiler_builtins"
764-
version = "0.1.66"
764+
version = "0.1.67"
765765
source = "registry+https://github.com/rust-lang/crates.io-index"
766-
checksum = "191424db7756bbed2c4996959a0fbda94388abcf4f5a2728a8af17481ad9c4f7"
766+
checksum = "a68c69e9451f1df4b215c9588c621670c12286b53e60fb5ec4b59aaa1138d18e"
767767
dependencies = [
768768
"cc",
769769
"rustc-std-workspace-core",

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }
1818
libc = { version = "0.2.116", default-features = false, features = ['rustc-dep-of-std'] }
19-
compiler_builtins = { version = "0.1.66" }
19+
compiler_builtins = { version = "0.1.67" }
2020
profiler_builtins = { path = "../profiler_builtins", optional = true }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }

0 commit comments

Comments
 (0)