From 153722d2f1b4dd2f6fc55a5806fe014f2aacb201 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 18 Nov 2015 04:35:32 +0000 Subject: Fix LLD testsuite fallout from r253429 llvm-svn: 253432 --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp') diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index df6e2a45862..54f24d7a00f 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -964,9 +964,9 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { uint64_t Address = Symb.first; StringRef Name = Symb.second; if (Name.startswith("$d")) - DataMappingSymsAddr.push_back(Address); + DataMappingSymsAddr.push_back(Address - SectionAddr); if (Name.startswith("$x")) - TextMappingSymsAddr.push_back(Address); + TextMappingSymsAddr.push_back(Address - SectionAddr); } } @@ -1000,7 +1000,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { // If the section has no symbol at the start, just insert a dummy one. if (Symbols.empty() || Symbols[0].first != 0) - Symbols.insert(Symbols.begin(), std::make_pair(0, name)); + Symbols.insert(Symbols.begin(), std::make_pair(SectionAddr, name)); SmallString<40> Comments; raw_svector_ostream CommentStream(Comments); @@ -1127,7 +1127,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { const std::pair &RHS) { return LHS < RHS.first; }); - if (TargetSym != Symbols.begin()) { + if (TargetSym != TargetSectionSymbols->begin()) { --TargetSym; uint64_t TargetAddress = std::get<0>(*TargetSym); StringRef TargetName = std::get<1>(*TargetSym); -- cgit v1.2.3