maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Change ELF relocation model to static 

llvm-svn: 175671
This commit is contained in:
Andrew Kaylor 2013-02-20 21:39:02 +00:00
parent 3f9568e921
commit 2ed4dc9f27
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/source/Expression/ClangExpressionParser.cpp
View File

@ -601,10 +601,15 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_allocation_addr,
} }
llvm::Triple triple(module_ap->getTargetTriple()); llvm::Triple triple(module_ap->getTargetTriple());
llvm::Function *function = module_ap->getFunction (function_name.c_str()); llvm::Function *function = module_ap->getFunction (function_name.c_str());
llvm::Reloc::Model relocModel;
if (triple.isOSBinFormatELF())
relocModel = llvm::Reloc::Static;
else
relocModel = llvm::Reloc::PIC_;
EngineBuilder builder(module_ap.release()); EngineBuilder builder(module_ap.release());
builder.setEngineKind(EngineKind::JIT) builder.setEngineKind(EngineKind::JIT)
.setErrorStr(&error_string) .setErrorStr(&error_string)
.setRelocationModel(llvm::Reloc::PIC_) .setRelocationModel(relocModel)
.setJITMemoryManager(jit_memory_manager) .setJITMemoryManager(jit_memory_manager)
.setOptLevel(CodeGenOpt::Less) .setOptLevel(CodeGenOpt::Less)
.setAllocateGVsWithCode(true) .setAllocateGVsWithCode(true)

2
lldb/source/Expression/RecordingMemoryManager.cpp
View File

@ -294,6 +294,8 @@ RecordingMemoryManager::ReportAllocations (llvm::ExecutionEngine &engine)
engine.mapSectionAddress((void*)ai->m_local_start, ai->m_remote_start); engine.mapSectionAddress((void*)ai->m_local_start, ai->m_remote_start);
} }
// Trigger re-application of relocations.
engine.finalizeObject();
} }
bool bool