bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Update llvm-emscripten

Browse source 
This updates emscripten to version 1.38.15, which is based on
LLVM 6.0.1.
This commit is contained in:
Nikita Popov 2018-11-02 15:17:39 +01:00
parent ac708826b0
commit 9eb19273a3
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -43,7 +43,7 @@
url = https://github.com/rust-lang/rust-by-example.git url = https://github.com/rust-lang/rust-by-example.git
[submodule "src/llvm-emscripten"] [submodule "src/llvm-emscripten"]
path = src/llvm-emscripten path = src/llvm-emscripten
url = https://github.com/rust-lang/llvm.git url = https://github.com/kripken/emscripten-fastcomp
[submodule "src/stdsimd"] [submodule "src/stdsimd"]
path = src/stdsimd path = src/stdsimd
url = https://github.com/rust-lang-nursery/stdsimd.git url = https://github.com/rust-lang-nursery/stdsimd.git

2
src/bootstrap/compile.rs
View file

@ -736,7 +736,7 @@ pub fn build_codegen_backend(builder: &Builder,
// Pass down configuration from the LLVM build into the build of // Pass down configuration from the LLVM build into the build of
// librustc_llvm and librustc_codegen_llvm. // librustc_llvm and librustc_codegen_llvm.
if builder.is_rust_llvm(target) { if builder.is_rust_llvm(target) && backend != "emscripten" {
cargo.env("LLVM_RUSTLLVM", "1"); cargo.env("LLVM_RUSTLLVM", "1");
} }
cargo.env("LLVM_CONFIG", &llvm_config); cargo.env("LLVM_CONFIG", &llvm_config);

10
src/ci/docker/asmjs/Dockerfile
View file

@ -20,11 +20,11 @@ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable
ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ ENV PATH=$PATH:/emsdk-portable/clang/e1.38.15_64bit/
ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ ENV PATH=$PATH:/emsdk-portable/emscripten/1.38.15/
ENV PATH=$PATH:/emsdk-portable/node/4.1.1_64bit/bin/ ENV PATH=$PATH:/emsdk-portable/node/8.9.1_64bit/bin/
ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/ ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.38.15/
ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/ ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.38.15_64bit/binaryen/
ENV EM_CONFIG=/emsdk-portable/.emscripten ENV EM_CONFIG=/emsdk-portable/.emscripten
ENV TARGETS=asmjs-unknown-emscripten ENV TARGETS=asmjs-unknown-emscripten

4
src/ci/docker/scripts/emscripten.sh
View file

@ -33,8 +33,8 @@ curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portab
cd /emsdk-portable cd /emsdk-portable
./emsdk update ./emsdk update
hide_output ./emsdk install sdk-1.37.13-64bit hide_output ./emsdk install sdk-1.38.15-64bit
./emsdk activate sdk-1.37.13-64bit ./emsdk activate sdk-1.38.15-64bit
# Compile and cache libc # Compile and cache libc
source ./emsdk_env.sh source ./emsdk_env.sh

2
src/llvm-emscripten

@ -1 +1 @@
Subproject commit 2717444753318e461e0c3b30dacd03ffbac96903 Subproject commit 272d3ff91b38eac051bdbaf6cf84db5c901ce2f8

2
src/rustllvm/PassWrapper.cpp
View file

@ -444,7 +444,7 @@ extern "C" void LLVMRustConfigurePassManagerBuilder(
LLVMPassManagerBuilderRef PMBR, LLVMRustCodeGenOptLevel OptLevel, LLVMPassManagerBuilderRef PMBR, LLVMRustCodeGenOptLevel OptLevel,
bool MergeFunctions, bool SLPVectorize, bool LoopVectorize, bool PrepareForThinLTO, bool MergeFunctions, bool SLPVectorize, bool LoopVectorize, bool PrepareForThinLTO,
const char* PGOGenPath, const char* PGOUsePath) { const char* PGOGenPath, const char* PGOUsePath) {
#if LLVM_RUSTLLVM #if LLVM_VERSION_GE(7, 0)
unwrap(PMBR)->MergeFunctions = MergeFunctions; unwrap(PMBR)->MergeFunctions = MergeFunctions;
#endif #endif
unwrap(PMBR)->SLPVectorize = SLPVectorize; unwrap(PMBR)->SLPVectorize = SLPVectorize;