diff options
| author | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-10 01:16:02 +0000 |
| commit | 06118eac4c602a22d2004c98756a95f2c5ec95d5 (patch) | |
| tree | 4039e739f4710fbe8a4aab96b21bfd1cc46a0daa /src/rustllvm/PassWrapper.cpp | |
| parent | 36a50c29f6c5c386fba6ab685818755ac55152e5 (diff) | |
| parent | 82574e9ec804b6efbf6dfcf523d32618528ee32b (diff) | |
| download | rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.tar.gz rust-06118eac4c602a22d2004c98756a95f2c5ec95d5.zip | |
Auto merge of #55626 - nikic:update-emscripten, r=alexcrichton
Update emscripten This updates emscripten to 1.38.15, which is based on LLVM 6.0.1 and would allow us to drop code for handling LLVM 4. The main issue I ran into is that exporting statics through `EXPORTED_FUNCTIONS` no longer works. As far as I understand exporting non-functions doesn't really make sense under emscripten anyway, so I've modified the symbol export code to not even try. Closes #52323.
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 200175da1bf..e8bfa222207 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -429,7 +429,7 @@ extern "C" void LLVMRustConfigurePassManagerBuilder( LLVMPassManagerBuilderRef PMBR, LLVMRustCodeGenOptLevel OptLevel, bool MergeFunctions, bool SLPVectorize, bool LoopVectorize, bool PrepareForThinLTO, const char* PGOGenPath, const char* PGOUsePath) { -#if LLVM_RUSTLLVM +#if LLVM_VERSION_GE(7, 0) unwrap(PMBR)->MergeFunctions = MergeFunctions; #endif unwrap(PMBR)->SLPVectorize = SLPVectorize; |