Skip to content

Commit e75499d

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 3f61060 + 7eb2efd commit e75499d

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

@@ -2479,7 +2479,7 @@ name = "rustc-demangle"
24792479
version = "0.1.10"
24802480
source = "registry+https://github.com/rust-lang/crates.io-index"
24812481
dependencies = [
2482-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2482+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
24832483
"rustc-std-workspace-core 1.0.0",
24842484
]
24852485

@@ -2579,7 +2579,7 @@ dependencies = [
25792579
"alloc 0.0.0",
25802580
"build_helper 0.1.0",
25812581
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2582-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2582+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
25832583
"core 0.0.0",
25842584
]
25852585

@@ -2806,7 +2806,7 @@ dependencies = [
28062806
"alloc 0.0.0",
28072807
"build_helper 0.1.0",
28082808
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2809-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2809+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
28102810
"core 0.0.0",
28112811
]
28122812

@@ -2868,7 +2868,7 @@ dependencies = [
28682868
"alloc 0.0.0",
28692869
"build_helper 0.1.0",
28702870
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2871-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2871+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
28722872
"core 0.0.0",
28732873
]
28742874

@@ -2989,7 +2989,7 @@ dependencies = [
29892989
"alloc 0.0.0",
29902990
"build_helper 0.1.0",
29912991
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2992-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
2992+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
29932993
"core 0.0.0",
29942994
]
29952995

@@ -3256,7 +3256,7 @@ dependencies = [
32563256
"alloc 0.0.0",
32573257
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
32583258
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
3259-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3259+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
32603260
"core 0.0.0",
32613261
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
32623262
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3829,7 +3829,7 @@ dependencies = [
38293829
name = "unwind"
38303830
version = "0.0.0"
38313831
dependencies = [
3832-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3832+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
38333833
"core 0.0.0",
38343834
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
38353835
]
@@ -4025,7 +4025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40254025
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40264026
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40274027
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4028-
"checksum compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a28c3898d0c57b26fa6f92de141ba665fa5ac5179f795db06db408be84302395"
4028+
"checksum compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d7de11892d9f9f1bc76d43011c8233d27d58300d629dc9dfb51b6626ef7f6077"
40294029
"checksum compiletest_rs 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "56c799b1f7142badf3b047b4c1f2074cc96b6b784fb2432f2ed9c87da0a03749"
40304030
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40314031
"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)