From: Cameron Zwarich <zwarich@apple.com>
Date: Fri, 3 Feb 2012 05:42:17 +0000 (+0000)
Subject: Do the same fix as r149667, but for the Mach-O disassembler.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ec8eac6d8b70234b2dfee623190d609e17206bca;p=oota-llvm.git

Do the same fix as r149667, but for the Mach-O disassembler.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149674 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index ffeea88bdc2..6ea03232edd 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -418,8 +418,11 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
         continue;
 
       // Start at the address of the symbol relative to the section's address.
+      uint64_t SectionAddress = 0;
       uint64_t Start = 0;
+      Sections[SectIdx].getAddress(SectionAddress);
       Symbols[SymIdx].getAddress(Start);
+      Start -= SectionAddress;
 
       // Stop disassembling either at the beginning of the next symbol or at
       // the end of the section.
@@ -433,6 +436,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
           Sections[SectIdx].containsSymbol(Symbols[NextSymIdx],
                                            containsNextSym);
           Symbols[NextSymIdx].getAddress(NextSym);
+          NextSym -= SectionAddress;
           break;
         }
         ++NextSymIdx;