Skip to content

Commit f35aed8

Browse files
authored
Rollup merge of rust-lang#59643 - alexcrichton:wasi-symbols, r=sanxiyn
std: Upgrade `compiler_builtins` to fix wasi linkage Turns out we needed to exclude a number of math functions on the `wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of compiler-builtins and this is pulling in the fix to libstd's own build.
2 parents ef622b3 + 7eb2efd commit f35aed8

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Cargo.lock

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
name = "alloc"
1818
version = "0.0.0"
1919
dependencies = [
20-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
20+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
2121
"core 0.0.0",
2222
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
2323
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -107,7 +107,7 @@ version = "0.1.27"
107107
source = "registry+https://github.com/rust-lang/crates.io-index"
108108
dependencies = [
109109
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
110-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
110+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
111111
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
112112
"rustc-std-workspace-core 1.0.0",
113113
]
@@ -465,7 +465,7 @@ dependencies = [
465465

466466
[[package]]
467467
name = "compiler_builtins"
468-
version = "0.1.8"
468+
version = "0.1.9"
469469
source = "registry+https://github.com/rust-lang/crates.io-index"
470470
dependencies = [
471471
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -751,7 +751,7 @@ name = "dlmalloc"
751751
version = "0.1.3"
752752
source = "registry+https://github.com/rust-lang/crates.io-index"
753753
dependencies = [
754-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
754+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
755755
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
756756
"rustc-std-workspace-core 1.0.0",
757757
]
@@ -917,7 +917,7 @@ name = "fortanix-sgx-abi"
917917
version = "0.3.2"
918918
source = "registry+https://github.com/rust-lang/crates.io-index"
919919
dependencies = [
920-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
920+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
921921
"rustc-std-workspace-core 1.0.0",
922922
]
923923

@@ -1769,7 +1769,7 @@ dependencies = [
17691769
name = "panic_abort"
17701770
version = "0.0.0"
17711771
dependencies = [
1772-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1772+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
17731773
"core 0.0.0",
17741774
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
17751775
]
@@ -1779,7 +1779,7 @@ name = "panic_unwind"
17791779
version = "0.0.0"
17801780
dependencies = [
17811781
"alloc 0.0.0",
1782-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1782+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
17831783
"core 0.0.0",
17841784
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
17851785
"unwind 0.0.0",
@@ -1964,7 +1964,7 @@ name = "profiler_builtins"
19641964
version = "0.0.0"
19651965
dependencies = [
19661966
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
1967-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1967+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
19681968
"core 0.0.0",
19691969
]
19701970

@@ -2499,7 +2499,7 @@ name = "rustc-demangle"
24992499
version = "0.1.10"
25002500
source = "registry+https://github.com/rust-lang/crates.io-index"
25012501
dependencies = [
2502-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2502+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
25032503
"rustc-std-workspace-core 1.0.0",
25042504
]
25052505

@@ -2599,7 +2599,7 @@ dependencies = [
25992599
"alloc 0.0.0",
26002600
"build_helper 0.1.0",
26012601
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2602-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2602+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
26032603
"core 0.0.0",
26042604
]
26052605

@@ -2826,7 +2826,7 @@ dependencies = [
28262826
"alloc 0.0.0",
28272827
"build_helper 0.1.0",
28282828
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2829-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2829+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
28302830
"core 0.0.0",
28312831
]
28322832

@@ -2888,7 +2888,7 @@ dependencies = [
28882888
"alloc 0.0.0",
28892889
"build_helper 0.1.0",
28902890
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2891-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2891+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
28922892
"core 0.0.0",
28932893
]
28942894

@@ -3009,7 +3009,7 @@ dependencies = [
30093009
"alloc 0.0.0",
30103010
"build_helper 0.1.0",
30113011
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
3012-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3012+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
30133013
"core 0.0.0",
30143014
]
30153015

@@ -3276,7 +3276,7 @@ dependencies = [
32763276
"alloc 0.0.0",
32773277
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
32783278
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
3279-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3279+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
32803280
"core 0.0.0",
32813281
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
32823282
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3849,7 +3849,7 @@ dependencies = [
38493849
name = "unwind"
38503850
version = "0.0.0"
38513851
dependencies = [
3852-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3852+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
38533853
"core 0.0.0",
38543854
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
38553855
]
@@ -4045,7 +4045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40454045
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40464046
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40474047
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4048-
"checksum compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a28c3898d0c57b26fa6f92de141ba665fa5ac5179f795db06db408be84302395"
4048+
"checksum compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d7de11892d9f9f1bc76d43011c8233d27d58300d629dc9dfb51b6626ef7f6077"
40494049
"checksum compiletest_rs 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "56c799b1f7142badf3b047b4c1f2074cc96b6b784fb2432f2ed9c87da0a03749"
40504050
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40514051
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ panic_unwind = { path = "../libpanic_unwind", optional = true }
1919
panic_abort = { path = "../libpanic_abort" }
2020
core = { path = "../libcore" }
2121
libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of-std'] }
22-
compiler_builtins = { version = "0.1.8" }
22+
compiler_builtins = { version = "0.1.9" }
2323
profiler_builtins = { path = "../libprofiler_builtins", optional = true }
2424
unwind = { path = "../libunwind" }
2525
rustc-demangle = { version = "0.1.10", features = ['rustc-dep-of-std'] }

0 commit comments

Comments
 (0)