diff options
| author | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
| commit | 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91 (patch) | |
| tree | 9a1cd1fe1091eb7e2ddaf1df8f9ea93eb70c6fa2 /src/test/ui/panic-runtime | |
| parent | 2e7244807a7878f6eca3eb7d97ae9b413aa49014 (diff) | |
| parent | 4a4df29d6fa12c303e3991f0e0e3677342c4787c (diff) | |
| download | rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.tar.gz rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.zip | |
Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton
Upgrade Emscripten targets to use upstream LLVM backend - Refactors the Emscripten target spec to share code with other wasm targets. - Replaces the incorrect wasm32 C call ABI with the old asmjs version, which is correct for both wasm32 and JS. - Updates the varargs ABI used by Emscripten and deletes the old one. - Removes the obsolete wasm32-experimental-emscripten target. - Temporarily makes Emscripten targets use panic=abort by default because supporting unwinding will require an LLVM patch.
Diffstat (limited to 'src/test/ui/panic-runtime')
| -rw-r--r-- | src/test/ui/panic-runtime/transitive-link-a-bunch.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/panic-runtime/want-unwind-got-abort.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/panic-runtime/want-unwind-got-abort2.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs index 5d72771c2dc..6dcb852a366 100644 --- a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs +++ b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs @@ -4,7 +4,7 @@ // aux-build:wants-panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs // error-pattern: is not compiled with this crate's panic strategy `unwind` -// ignore-wasm32-bare compiled with panic=abort by default +// ignore-emscripten compiled with panic=abort by default #![no_std] #![no_main] diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort.rs b/src/test/ui/panic-runtime/want-unwind-got-abort.rs index 4c25c09d643..e7811d40b5b 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort.rs @@ -1,7 +1,7 @@ // error-pattern:is incompatible with this crate's strategy of `unwind` // aux-build:panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs -// ignore-wasm32-bare compiled with panic=abort by default +// ignore-emscripten compiled with panic=abort by default #![no_std] #![no_main] diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs index 478af451e7f..44671796c01 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs @@ -2,7 +2,7 @@ // aux-build:panic-runtime-abort.rs // aux-build:wants-panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs -// ignore-wasm32-bare compiled with panic=abort by default +// ignore-emscripten compiled with panic=abort by default #![no_std] #![no_main] |