Revert "Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton"

This reverts commit 7870050796, reversing changes made to 2e7244807a.
2019-10-05 21:38:45 -07:00 · 2019-10-05 21:38:45 -07:00 · d16b7f705b
commit d16b7f705b
parent 7870050796
142 changed files with 537 additions and 377 deletions
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@ -257,7 +257,8 @@ pub fn target_feature_whitelist(sess: &Session)
        "hexagon" => HEXAGON_WHITELIST,
        "mips" | "mips64" => MIPS_WHITELIST,
        "powerpc" | "powerpc64" => POWERPC_WHITELIST,
-        "wasm32" => WASM_WHITELIST,
+        // wasm32 on emscripten does not support these target features
+        "wasm32" if !sess.target.target.options.is_like_emscripten => WASM_WHITELIST,
        _ => &[],
    }
 }