From d97e73205cb902544d1a633a8859565476ae8822 Mon Sep 17 00:00:00 2001
From: Davide Italiano <davide@freebsd.org>
Date: Mon, 16 Jan 2017 23:13:46 +0000
Subject: [PATCH] [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
---
 test/Object/Inputs/phdr-note.elf-x86-64 | Bin 0 -> 5048 bytes
 test/tools/llvm-objdump/X86/phdrs.test  |  14 ++++++++++++++
 tools/llvm-objdump/ELFDump.cpp          |   3 +++
 3 files changed, 17 insertions(+)
 create mode 100755 test/Object/Inputs/phdr-note.elf-x86-64

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 0000000000000000000000000000000000000000..2825c6840ca8374df0c7d60b001dcf3633c7c607
GIT binary patch
literal 5048
zcmeH~zfJ-{5XKi!QL(VFFjmCMSX`hp76uhfOwdGQV<iYAXK|2lS4ib+_&C0doeyB?
z%-#G59GYM#Y<3gw+xhd&%zk$i`+Cv3EEWomRdOdTwYD=)!vbGstJ!czt}M@r+i+`Q
zucSVWXe?XcyOjplEv|0m{kH1GECM>~uRQIEoyWGuWVO?$JdCI1{=#F<yN{%o&dK?6
znD1l9b+^Jx`!UCYsJ+sDc7B&b<^t)rVEMVU!#U5aL+dZwW45BVyaHYUuYgy;E8rFI
z3U~#)0$u^HfLGu@6yT1!ZuiWJ4Y6yuYFM-QrrF#Hxx-hvr&=6nwVKs>P{W+Vv`$f`
z;9gBeFc>ENAnC`63wq;0JdRutcH%Izl97|xOBU-y&s`UEhf&lYh(}VB&XZsmC!=ha
zp?hpT+?-xtozr6p)Va&@n;e^sA@_4ypcnR*Y*cG#=nta5>Z@Gp;olLTz8m=H4<aXV
z-V?Yd+|m@E_Y3Cd&D;CJRUhBa<o(fDV$+Mh_zq;FT%93Z@C@7LhR69yt4mz_*DMcc
zTLSs`nIAls0NRkF7#g3t`n@ZMdgy;9zRB#eXT2H!9)}@)akpgi6aUlr{LjeG^S=RM
CZZ-4(

literal 0
HcmV?d00001

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;
-- 
2.50.1