summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/llvm-objdump.cpp
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2016-03-21 20:59:15 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2016-03-21 20:59:15 +0000
commit9219fe79b9842f3be3524c2e9aeb807ddffdfe3e (patch)
treea6c9bc6bf6201290105e1f2d2cb22a83ce045744 /llvm/tools/llvm-objdump/llvm-objdump.cpp
parent738c6277a6b7e137fdc52d70874291e1a697786e (diff)
downloadbcm5719-llvm-9219fe79b9842f3be3524c2e9aeb807ddffdfe3e.tar.gz
bcm5719-llvm-9219fe79b9842f3be3524c2e9aeb807ddffdfe3e.zip
Revert "[llvm-objdump] Printing relocations in executable and shared object files. This partially reverts r215844 by removing test objdump-reloc-shared.test which stated GNU objdump doesn't print relocations, it does."
This reverts commit r263971. It produces the wrong results for .rela.dyn. I will add a test. llvm-svn: 263987
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/llvm-objdump.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 7f49efd8f84..f436183f065 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1188,6 +1188,10 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
void llvm::PrintRelocations(const ObjectFile *Obj) {
StringRef Fmt = Obj->getBytesInAddress() > 4 ? "%016" PRIx64 :
"%08" PRIx64;
+ // Regular objdump doesn't print relocations in non-relocatable object
+ // files.
+ if (!Obj->isRelocatableObject())
+ return;
for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
if (Section.relocation_begin() == Section.relocation_end())
OpenPOWER on IntegriCloud