From 147ffd48166d851341cadd12de98895f32ec25a2 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 26 May 2015 22:18:28 -0700 Subject: gallivm: Do not use NoFramePointerElim with LLVM 3.7. TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244 "Remove NoFramePointerElim and NoFramePointerElimOverride from TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC." Signed-off-by: Vinson Lee Reviewed-by: Tom Stellard --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 2 ++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index be3e834b774..76c302f6531 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -277,7 +277,9 @@ disassemble(const void* func, llvm::raw_ostream & Out) options.StackAlignmentOverride = 4; #endif #if defined(DEBUG) || defined(PROFILE) +#if HAVE_LLVM < 0x0307 options.NoFramePointerElim = true; +#endif #endif OwningPtr TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options)); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 5e8a634f019..ffed9e6b69a 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -439,7 +439,9 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, #if HAVE_LLVM < 0x0304 options.NoFramePointerElimNonLeaf = true; #endif +#if HAVE_LLVM < 0x0307 options.NoFramePointerElim = true; +#endif #endif builder.setEngineKind(EngineKind::JIT) -- cgit v1.2.3