bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #55626 - nikic:update-emscripten, r=alexcrichton

Browse source 
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.
This commit is contained in:
bors 2018-11-10 01:16:02 +00:00
commit 06118eac4c
18 changed files with 48 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rustllvm/PassWrapper.cpp
View file

@ -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;