[llvm-readobj] Include the PE magic value in printouts

This is useful for a testcase in lld.

Differential Revision: https://reviews.llvm.org/D34836

llvm-svn: 306794
diff --git a/llvm/test/tools/llvm-readobj/file-headers.test b/llvm/test/tools/llvm-readobj/file-headers.test
index 47fb24d..5bfebf7 100644
--- a/llvm/test/tools/llvm-readobj/file-headers.test
+++ b/llvm/test/tools/llvm-readobj/file-headers.test
@@ -238,6 +238,7 @@
 PE32-NEXT:   ]
 PE32-NEXT: }
 PE32-NEXT: ImageOptionalHeader {
+PE32-NEXT:   Magic: 0x10B
 PE32-NEXT:   MajorLinkerVersion: 11
 PE32-NEXT:   MinorLinkerVersion: 0
 PE32-NEXT:   SizeOfCode: 512
diff --git a/llvm/test/tools/llvm-readobj/peplus.test b/llvm/test/tools/llvm-readobj/peplus.test
index 4d8d25d..3619cd7 100644
--- a/llvm/test/tools/llvm-readobj/peplus.test
+++ b/llvm/test/tools/llvm-readobj/peplus.test
@@ -16,6 +16,7 @@
 CHECK:   ]
 CHECK: }
 CHECK: ImageOptionalHeader {
+CHECK:   Magic: 0x20B
 CHECK:   MajorLinkerVersion: 11
 CHECK:   MinorLinkerVersion: 0
 CHECK:   SizeOfCode: 512
diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp
index daa7a64..96a1f62 100644
--- a/llvm/tools/llvm-readobj/COFFDumper.cpp
+++ b/llvm/tools/llvm-readobj/COFFDumper.cpp
@@ -678,6 +678,7 @@
 template <class PEHeader>
 void COFFDumper::printPEHeader(const PEHeader *Hdr) {
   DictScope D(W, "ImageOptionalHeader");
+  W.printHex   ("Magic", Hdr->Magic);
   W.printNumber("MajorLinkerVersion", Hdr->MajorLinkerVersion);
   W.printNumber("MinorLinkerVersion", Hdr->MinorLinkerVersion);
   W.printNumber("SizeOfCode", Hdr->SizeOfCode);