diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-02 15:17:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-04 18:50:57 +0100 |
| commit | 9eb19273a3ad514529cbb80f22e198e01de18a82 (patch) | |
| tree | 9a12db483f20cee5cf14ce5f64672a58943d8be4 /src/rustllvm | |
| parent | ac708826b0d97e105f91a4cde41bfe14cff032f2 (diff) | |
| download | rust-9eb19273a3ad514529cbb80f22e198e01de18a82.tar.gz rust-9eb19273a3ad514529cbb80f22e198e01de18a82.zip | |
Update llvm-emscripten
This updates emscripten to version 1.38.15, which is based on LLVM 6.0.1.
Diffstat (limited to 'src/rustllvm')
| -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 06f75d981e3..902e62ab4a1 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -444,7 +444,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; |