Skip to content

Commit 8d45e10

Browse files
Auto merge of #137457 - JayAndJef:issue-132802-fix, r=<try>
Fix host code appearing in Wasm binaries <!-- homu-ignore:start --> <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r? <reviewer name> --> <!-- homu-ignore:end --> This is a direct fix for issue [132802](#132802). Followed the outline as follows: > * give a hard error in bootstrap when using gcc to compile for wasm > * change our CI to use clang instead of gcc > * add a test that compiling a sample program for wasm32-unknown doesn't give any linker warnings The `test-various` ci job was also changed. try-job: test-various try-job: dist-various-1 try-job: dist-various-2 try-job: x86_64-msvc-1
2 parents 4e97337 + 8b1dbac commit 8d45e10

File tree

5 files changed

+42
-3
lines changed

5 files changed

+42
-3
lines changed

src/bootstrap/src/core/sanity.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,22 @@ than building it.
328328
.entry(*target)
329329
.or_insert_with(|| Target::from_triple(&target.triple));
330330

331+
// compiler-rt c fallbacks for wasm cannot be built with gcc
332+
if target.contains("wasm")
333+
&& (build.config.optimized_compiler_builtins(*target)
334+
|| build.config.rust_std_features.contains("compiler-builtins-c"))
335+
{
336+
let cc_tool = build.cc_tool(*target);
337+
if !cc_tool.is_like_clang() {
338+
panic!(
339+
"Clang is required to build C code for Wasm targets, got `{}` instead\n\
340+
this is because compiler-builtins is configured to build C source. Either \
341+
ensure Clang is used, or adjust this configuration.",
342+
cc_tool.path().display()
343+
);
344+
}
345+
}
346+
331347
if (target.contains("-none-") || target.contains("nvptx"))
332348
&& build.no_std(*target) == Some(false)
333349
{

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ RUN ./install-riscv64-none-elf.sh
5555
COPY host-x86_64/dist-various-1/install-riscv32-none-elf.sh /build
5656
RUN ./install-riscv32-none-elf.sh
5757

58+
COPY host-x86_64/dist-various-1/install-emscripten.sh /build
59+
RUN ./install-emscripten.sh
60+
61+
# Add Emscripten to PATH
62+
ENV PATH="/build/emsdk:/build/emsdk/upstream/emscripten:/build/emsdk/node/current/bin:${PATH}"
63+
5864
# Suppress some warnings in the openwrt toolchains we downloaded
5965
ENV STAGING_DIR=/tmp
6066

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
set -ex
3+
4+
apt-get update
5+
apt-get install -y --no-install-recommends \
6+
nodejs \
7+
default-jre
8+
9+
git clone https://github.com/emscripten-core/emsdk.git
10+
cd emsdk
11+
./emsdk install latest
12+
./emsdk activate latest

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ ENV \
5959
CXX_i686_unknown_uefi=clang++-11 \
6060
CC_x86_64_unknown_uefi=clang-11 \
6161
CXX_x86_64_unknown_uefi=clang++-11 \
62+
CC_wasm32_unknown_unknown=clang-11 \
63+
CXX_wasm32_unknown_unknown=clang++-11 \
64+
CC_wasm32v1_none=clang-11 \
65+
CXX_wasm32v1_none=clang++-11 \
6266
CC=gcc-9 \
6367
CXX=g++-9
6468

src/ci/docker/host-x86_64/test-various/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update && apt-get install -y --no-install-recommends \
55
clang-11 \
66
llvm-11 \
7+
gcc-multilib \
78
g++ \
89
make \
910
ninja-build \
@@ -59,8 +60,8 @@ RUN curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v19.0
5960
tar -xJ
6061
ENV PATH "$PATH:/wasmtime-v19.0.0-x86_64-linux"
6162

62-
ENV WASM_TARGETS=wasm32-wasip1
63-
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \
63+
ENV WASM_WASIP_TARGET=wasm32-wasip1
64+
ENV WASM_WASIP_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_WASIP_TARGET \
6465
tests/run-make \
6566
tests/ui \
6667
tests/mir-opt \
@@ -90,4 +91,4 @@ ENV UEFI_TARGETS=aarch64-unknown-uefi,i686-unknown-uefi,x86_64-unknown-uefi \
9091
ENV UEFI_SCRIPT python3 /checkout/x.py --stage 2 build --host='' --target $UEFI_TARGETS && \
9192
python3 -u /uefi_qemu_test/run.py
9293

93-
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT && $UEFI_SCRIPT
94+
ENV SCRIPT $WASM_WASIP_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT && $UEFI_SCRIPT

0 commit comments

Comments
 (0)