Skip to content

Commit 7870050

Browse files
committedOct 4, 2019
Auto merge of rust-lang#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.
2 parents 2e72448 + 4a4df29 commit 7870050

File tree

142 files changed

+377
-537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+377
-537
lines changed
 

‎config.toml.example

+1
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@
377377
# but you can also optionally enable the "emscripten" backend for asm.js or
378378
# make this an empty array (but that probably won't get too far in the
379379
# bootstrap)
380+
# FIXME: remove the obsolete emscripten backend option.
380381
#codegen-backends = ["llvm"]
381382

382383
# This is the name of the directory in which codegen backends will get installed

‎src/bootstrap/builder.rs

+1
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,7 @@ impl<'a> Builder<'a> {
970970
Some("-Wl,-rpath,@loader_path/../lib")
971971
} else if !target.contains("windows") &&
972972
!target.contains("wasm32") &&
973+
!target.contains("emscripten") &&
973974
!target.contains("fuchsia") {
974975
Some("-Wl,-rpath,$ORIGIN/../lib")
975976
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.