Skip to content

Commit 7eb2efd

Browse files
alexcrichtonalexcrichton
committed
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.
1 parent f694222 commit 7eb2efd

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)",
@@ -106,7 +106,7 @@ version = "0.1.27"
106106
source = "registry+https://github.com/rust-lang/crates.io-index"
107107
dependencies = [
108108
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
109-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
109+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
110110
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
111111
"rustc-std-workspace-core 1.0.0",
112112
]
@@ -464,7 +464,7 @@ dependencies = [
464464

465465
[[package]]
466466
name = "compiler_builtins"
467-
version = "0.1.8"
467+
version = "0.1.9"
468468
source = "registry+https://github.com/rust-lang/crates.io-index"
469469
dependencies = [
470470
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -750,7 +750,7 @@ name = "dlmalloc"
750750
version = "0.1.3"
751751
source = "registry+https://github.com/rust-lang/crates.io-index"
752752
dependencies = [
753-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
753+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
754754
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
755755
"rustc-std-workspace-core 1.0.0",
756756
]
@@ -916,7 +916,7 @@ name = "fortanix-sgx-abi"
916916
version = "0.3.2"
917917
source = "registry+https://github.com/rust-lang/crates.io-index"
918918
dependencies = [
919-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
919+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
920920
"rustc-std-workspace-core 1.0.0",
921921
]
922922

@@ -1768,7 +1768,7 @@ dependencies = [
17681768
name = "panic_abort"
17691769
version = "0.0.0"
17701770
dependencies = [
1771-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1771+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
17721772
"core 0.0.0",
17731773
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
17741774
]
@@ -1778,7 +1778,7 @@ name = "panic_unwind"
17781778
version = "0.0.0"
17791779
dependencies = [
17801780
"alloc 0.0.0",
1781-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1781+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
17821782
"core 0.0.0",
17831783
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
17841784
"unwind 0.0.0",
@@ -1963,7 +1963,7 @@ name = "profiler_builtins"
19631963
version = "0.0.0"
19641964
dependencies = [
19651965
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
1966-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
1966+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
19671967
"core 0.0.0",
19681968
]
19691969

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

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

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

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

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

@@ -3275,7 +3275,7 @@ dependencies = [
32753275
"alloc 0.0.0",
32763276
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
32773277
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
3278-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3278+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
32793279
"core 0.0.0",
32803280
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
32813281
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3848,7 +3848,7 @@ dependencies = [
38483848
name = "unwind"
38493849
version = "0.0.0"
38503850
dependencies = [
3851-
"compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
3851+
"compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
38523852
"core 0.0.0",
38533853
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
38543854
]
@@ -4044,7 +4044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40444044
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40454045
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40464046
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4047-
"checksum compiler_builtins 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "a28c3898d0c57b26fa6f92de141ba665fa5ac5179f795db06db408be84302395"
4047+
"checksum compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d7de11892d9f9f1bc76d43011c8233d27d58300d629dc9dfb51b6626ef7f6077"
40484048
"checksum compiletest_rs 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "56c799b1f7142badf3b047b4c1f2074cc96b6b784fb2432f2ed9c87da0a03749"
40494049
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40504050
"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)