From: Davide Italiano <davide@freebsd.org>
Date: Mon, 16 Jan 2017 23:13:46 +0000 (+0000)
Subject: [llvm-objdump] Dump PT_NOTE as part of -p.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d97e73205cb902544d1a633a8859565476ae8822;p=llvm

[llvm-objdump] Dump PT_NOTE as part of -p.

PR: 31641

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

diff --git a/test/Object/Inputs/phdr-note.elf-x86-64 b/test/Object/Inputs/phdr-note.elf-x86-64
new file mode 100755
index 00000000000..2825c6840ca
Binary files /dev/null and b/test/Object/Inputs/phdr-note.elf-x86-64 differ
diff --git a/test/tools/llvm-objdump/X86/phdrs.test b/test/tools/llvm-objdump/X86/phdrs.test
index c84b24cbe19..646f6af8733 100644
--- a/test/tools/llvm-objdump/X86/phdrs.test
+++ b/test/tools/llvm-objdump/X86/phdrs.test
@@ -16,3 +16,17 @@ RUN:     | FileCheck %s
 
 CHECK: RELRO off    0x0000000000001000 vaddr 0x0000000000201000 paddr 0x0000000000201000 align 2**0
 CHECK-NEXT:      filesz 0x0000000000000004 memsz 0x0000000000001000 flags r--
+
+## phdr-note.elf-x86-64 was generated using lld (3.9).
+## llvm-mc -filetype=obj -triple=x86_64-pc-linux test.s -o test.o
+## lld test.o -o phdr-note.elf-x86-64 -shared
+##
+## test.s:
+##       .section        .note.test,"a",@note
+##       .quad 42
+
+RUN: llvm-objdump -p %p/../../../Object/Inputs/phdr-note.elf-x86-64 \
+RUN:     | FileCheck %s --check-prefix=NOTE
+
+NOTE: NOTE off    0x0000000000000200 vaddr 0x0000000000000200 paddr 0x0000000000000200 align 2**0
+NOTE-NEXT:       filesz 0x0000000000000008 memsz 0x0000000000000008 flags r--
diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp
index a613f2195b2..7f5fe5a9d3b 100644
--- a/tools/llvm-objdump/ELFDump.cpp
+++ b/tools/llvm-objdump/ELFDump.cpp
@@ -48,6 +48,9 @@ template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
     case ELF::PT_LOAD:
       outs() << "    LOAD ";
       break;
+    case ELF::PT_NOTE:
+      outs() << "    NOTE ";
+      break;
     case ELF::PT_OPENBSD_BOOTDATA:
       outs() << "    OPENBSD_BOOTDATA ";
       break;