From d871b20cb54a8f0add2d4a5e5def6abced12ccc3 Mon Sep 17 00:00:00 2001
From: Davide Italiano <davide@freebsd.org>
Date: Mon, 16 Jan 2017 22:58:26 +0000
Subject: [PATCH] [llvm-objdump] Dump PT_GNU_RELRO as part of -p.

PR: 31641

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@292169 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Object/Inputs/phdrs.elf-x86-64    | Bin 0 -> 4720 bytes
 test/tools/llvm-objdump/X86/phdrs.test |  18 ++++++++++++++++++
 tools/llvm-objdump/ELFDump.cpp         |   3 +++
 3 files changed, 21 insertions(+)
 create mode 100755 test/Object/Inputs/phdrs.elf-x86-64
 create mode 100644 test/tools/llvm-objdump/X86/phdrs.test

diff --git a/test/Object/Inputs/phdrs.elf-x86-64 b/test/Object/Inputs/phdrs.elf-x86-64
new file mode 100755
index 0000000000000000000000000000000000000000..078574ab5801b9c9dc413c6d18c91f2d51eb3cd2
GIT binary patch
literal 4720
zcmeHLF;2rk5ZpL{P$Y^Q5Dk($ItMx`<N~PNkPkp0K{Sq|_=-@`<`;Z{XYdjJ!S3A-
zSf>aO4b5KR*_+$hy&G3|&zI#@(&-RJLg(aXY38Xy7hY2h7z#S0UH<lIhmok~xv*YP
z<^$kHO9S^pn(raHuaRjO@J)3<(*8nAPs~a82}DgG^7<_C9M18BPTSMu-OYZZLm%j_
zS?BjDd$nN>m;>g3IbaT$1LlA^U=ElA=72e14*atN3HL9{i|jN%`F1Da-p$##H*2=s
zaZ|a?NBofa1Cr{|$lZMHD1WGH%J1u{nlE_PJXLOb$N1Q|RfqzH#GA%VSB_>;slQC+
z9N{dg#=h|`5EcD=M^Ikg5k%j`LZk<cGLqXK1D*&MyWP|NcprfVdf+}UY;l!R)!(X6
l{)^<H-l6hGj9rb}uvGoHO>&IBppQA&rhifW2#JcZ{sV~aCj$Tg

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/X86/phdrs.test b/test/tools/llvm-objdump/X86/phdrs.test
new file mode 100644
index 00000000000..c84b24cbe19
--- /dev/null
+++ b/test/tools/llvm-objdump/X86/phdrs.test
@@ -0,0 +1,18 @@
+## phdrs.elf-x86-64 was generated using lld (3.9).
+## llvm-mc -filetype=obj -triple=x86_64-unknown-linux test.s -o test.o
+## lld test.o -o phdrs.elf-x86-64
+##
+## test.s:
+## .global _start
+## _start:
+##
+## .global d
+## .section .foo,"awT",@progbits
+## d:
+## .long 2
+##
+RUN: llvm-objdump -p %p/../../../Object/Inputs/phdrs.elf-x86-64 \
+RUN:     | FileCheck %s
+
+CHECK: RELRO off    0x0000000000001000 vaddr 0x0000000000201000 paddr 0x0000000000201000 align 2**0
+CHECK-NEXT:      filesz 0x0000000000000004 memsz 0x0000000000001000 flags r--
diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp
index 6434fb6cb08..a613f2195b2 100644
--- a/tools/llvm-objdump/ELFDump.cpp
+++ b/tools/llvm-objdump/ELFDump.cpp
@@ -36,6 +36,9 @@ template <class ELFT> void printProgramHeaders(const ELFFile<ELFT> *o) {
     case ELF::PT_GNU_EH_FRAME:
       outs() << "EH_FRAME ";
       break;
+    case ELF::PT_GNU_RELRO:
+      outs() << "   RELRO ";
+      break;
     case ELF::PT_GNU_STACK:
       outs() << "   STACK ";
       break;
-- 
2.50.1