RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-15 06:01:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix LLD testsuite fallout from r253429

Browse Source 
llvm-svn: 253432
This commit is contained in:
David Majnemer 2015-11-18 04:35:32 +00:00
parent 92cbd8823c
commit dc709fc7ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/llvm-objdump/llvm-objdump.cpp
View File

@ -964,9 +964,9 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
uint64_t Address = Symb.first; uint64_t Address = Symb.first;
StringRef Name = Symb.second; StringRef Name = Symb.second;
if (Name.startswith("$d")) if (Name.startswith("$d"))
DataMappingSymsAddr.push_back(Address); DataMappingSymsAddr.push_back(Address - SectionAddr);
if (Name.startswith("$x")) 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 the section has no symbol at the start, just insert a dummy one.
if (Symbols.empty() || Symbols[0].first != 0) 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; SmallString<40> Comments;
raw_svector_ostream CommentStream(Comments); raw_svector_ostream CommentStream(Comments);
@ -1127,7 +1127,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
const std::pair<uint64_t, StringRef> &RHS) { const std::pair<uint64_t, StringRef> &RHS) {
return LHS < RHS.first; return LHS < RHS.first;
}); });
if (TargetSym != Symbols.begin()) { if (TargetSym != TargetSectionSymbols->begin()) {
--TargetSym; --TargetSym;
uint64_t TargetAddress = std::get<0>(*TargetSym); uint64_t TargetAddress = std::get<0>(*TargetSym);
StringRef TargetName = std::get<1>(*TargetSym); StringRef TargetName = std::get<1>(*TargetSym);