Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand wasm32 testing on CI #360

Merged
merged 2 commits into from
May 29, 2020
Merged

Expand wasm32 testing on CI #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c85e4f
Expand wasm32 testing on CI
alexcrichton May 29, 2020
6bcb1ab
Update libm
alexcrichton May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 2 additions & 29 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,6 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
target:
- aarch64-unknown-linux-gnu
- arm-unknown-linux-gnueabi
- arm-unknown-linux-gnueabihf
- i586-unknown-linux-gnu
- i686-unknown-linux-gnu
- mips-unknown-linux-gnu
- mips64-unknown-linux-gnuabi64
- mips64el-unknown-linux-gnuabi64
- mipsel-unknown-linux-gnu
- powerpc-unknown-linux-gnu
- powerpc64-unknown-linux-gnu
- powerpc64le-unknown-linux-gnu
- thumbv6m-none-eabi
- thumbv7em-none-eabi
- thumbv7em-none-eabihf
- thumbv7m-none-eabi
- wasm32-unknown-unknown
- x86_64-unknown-linux-gnu
- x86_64-apple-darwin
- i686-pc-windows-msvc
- x86_64-pc-windows-msvc
- i686-pc-windows-gnu
- x86_64-pc-windows-gnu
include:
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest
Expand Down Expand Up @@ -109,6 +85,7 @@ jobs:
run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
shell: bash
- run: rustup target add ${{ matrix.target }}
- run: rustup component add llvm-tools-preview
- name: Download compiler-rt reference sources
run: |
curl -L -o code.tar.gz https://github.com/rust-lang/llvm-project/archive/rustc/8.0-2019-03-18.tar.gz
Expand All @@ -121,13 +98,9 @@ jobs:
if: matrix.os != 'ubuntu-latest'
shell: bash

# Wasm is special and is just build as a smoke test
- run: cargo build --target ${{ matrix.target }}
if: matrix.target == 'wasm32-unknown-unknown'

# Otherwise we use our docker containers to run builds
- run: cargo generate-lockfile && ./ci/run-docker.sh ${{ matrix.target }}
if: matrix.target != 'wasm32-unknown-unknown' && matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-latest'

rustfmt:
name: Rustfmt
Expand Down
6 changes: 6 additions & 0 deletions ci/docker/wasm32-unknown-unknown/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ubuntu:20.04
RUN apt-get update && \
apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates

ENV CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=true
10 changes: 6 additions & 4 deletions ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ case $1 in
;;
esac

NM=nm
NM=$(find $(rustc --print sysroot) -name llvm-nm)
if [ "$NM" = "" ]; then
NM=${PREFIX}nm
fi

if [ -d /target ]; then
path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib
Expand All @@ -47,8 +50,7 @@ for rlib in $(echo $path); do
echo checking $rlib for duplicate symbols
echo "================================================================"

stdout=$($PREFIX$NM -g --defined-only $rlib 2>&1)

stdout=$($NM -g --defined-only $rlib 2>&1)
# NOTE On i586, It's normal that the get_pc_thunk symbol appears several
# times so ignore it
#
Expand Down Expand Up @@ -94,7 +96,7 @@ CARGO_PROFILE_RELEASE_LTO=true \
# Ensure no references to a panicking function
for rlib in $(echo $path); do
set +ex
$PREFIX$NM -u $rlib 2>&1 | grep panicking
$NM -u $rlib 2>&1 | grep panicking

if test $? = 0; then
exit 1
Expand Down
6 changes: 3 additions & 3 deletions examples/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

extern crate panic_handler;

#[cfg(all(not(thumb), not(windows)))]
#[cfg(all(not(thumb), not(windows), not(target_arch = "wasm32")))]
#[link(name = "c")]
extern "C" {}

Expand Down Expand Up @@ -340,11 +340,11 @@ fn run() {
something_with_a_dtor(&|| assert_eq!(bb(1), 1));

extern "C" {
fn rust_begin_unwind();
fn rust_begin_unwind(x: usize);
}
// if bb(false) {
unsafe {
rust_begin_unwind();
rust_begin_unwind(0);
}
// }
}
Expand Down
2 changes: 1 addition & 1 deletion libm
Open in desktop
Submodule libm updated 19 files
+67 −0 .github/workflows/main.yml
+3 −3 CONTRIBUTING.md
+2 −2 Cargo.toml
+5 −7 README.md
+0 −82 azure-pipelines.yml
+0 −25 ci/azure-install-rust.yml
+4 −1 crates/compiler-builtins-smoke-test/Cargo.toml
+1 −4 src/lib.rs
+4 −4 src/math/atanf.rs
+1 −1 src/math/exp.rs
+3 −3 src/math/exp2.rs
+1 −1 src/math/exp2f.rs
+1 −1 src/math/expf.rs
+18 −0 src/math/mod.rs
+6 −6 src/math/pow.rs
+6 −6 src/math/powf.rs
+6 −6 src/math/rem_pio2.rs
+2 −2 src/math/rem_pio2_large.rs
+39 −8 src/math/sincosf.rs
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
extern crate core;

fn abort() -> ! {
unsafe { core::intrinsics::abort() }
core::intrinsics::abort()
}

#[macro_use]
Expand Down