summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2014-09-03 05:42:52 +0000
committerLang Hames <lhames@gmail.com>2014-09-03 05:42:52 +0000
commit925e51b11d38085027ed7690f87659302ad3b71e (patch)
tree2ea0c17ef63a2a16648da79ba6faa5a963cb7d1e
parent587ee6ab4f7285cb0caf0301c2b7d5cf35965395 (diff)
downloadbcm5719-llvm-925e51b11d38085027ed7690f87659302ad3b71e.tar.gz
bcm5719-llvm-925e51b11d38085027ed7690f87659302ad3b71e.zip
[MCJIT] Make llvm-rtdyld process eh_frame sections in -verify mode (accidentally
left out of r217010). Also remove a crufty debugging output statement that was accidentally left in. llvm-svn: 217011
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp1
-rw-r--r--llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
index c42287a480b..07e0d3ab645 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
@@ -860,7 +860,6 @@ void RuntimeDyldCheckerImpl::registerSection(
const SectionEntry &Section = getRTDyld().Sections[SectionID];
StringRef SectionName = Section.Name;
- dbgs() << "Registering " << SectionName << "\n";
Stubs[FileName][SectionName].SectionID = SectionID;
}
diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index f626a56cbb1..462f6c17145 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -411,6 +411,7 @@ static int linkAndVerify() {
// Instantiate a dynamic linker.
TrivialMemoryManager MemMgr;
RuntimeDyld Dyld(&MemMgr);
+ Dyld.setProcessAllSections(true);
RuntimeDyldChecker Checker(Dyld, Disassembler.get(), InstPrinter.get(),
llvm::dbgs());
@@ -439,6 +440,9 @@ static int linkAndVerify() {
// Resolve all the relocations we can.
Dyld.resolveRelocations();
+ // Register EH frames.
+ Dyld.registerEHFrames();
+
int ErrorCode = checkAllExpressions(Checker);
if (Dyld.hasError()) {
errs() << "RTDyld reported an error applying relocations:\n "
OpenPOWER on IntegriCloud