From: George Rimar <grimar@accesssoftek.com>
Date: Mon, 28 Jan 2019 16:36:12 +0000 (+0000)
Subject: [llvm-objdump] - Restore a piece of code removed by mistake in r352366.
X-Git-Tag: llvmorg-10-init~13506
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4463ebe4a75dfcf6633bbda8f4b6a466750e6da3;p=platform%2Fupstream%2Fllvm.git

[llvm-objdump] - Restore a piece of code removed by mistake in r352366.

Seems when committed the r352366
("[llvm-objdump] - Print LMAs when dumping section headers.")
I resolved merge conflict incorrectly and removed this piece by mistake.

Bots did not catch this yet, seems they are slow today,
but the `X86/adjust-vma.test` test case fails locally for me without that.

llvm-svn: 352383
---

diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 1ba0cfc..87ed8bb 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -1547,6 +1547,9 @@ void llvm::printSectionHeaders(const ObjectFile *Obj) {
     StringRef Name;
     error(Section.getName(Name));
     uint64_t VMA = Section.getAddress();
+    if (shouldAdjustVA(Section))
+      VMA += AdjustVMA;
+
     uint64_t Size = Section.getSize();
     bool Text = Section.isText();
     bool Data = Section.isData();