From eeb2fa98774159100263f927c2b44b674ffd9e96 Mon Sep 17 00:00:00 2001
From: Simon Atanasyan <simon@atanasyan.com>
Date: Fri, 15 May 2015 15:59:22 +0000
Subject: [PATCH] [llvm-readobj] Teach llvm-readobj to print PT_MIPS_ABIFLAGS
 program header

llvm-svn: 237451
---
 llvm/test/Object/Inputs/program-headers.mips  | Bin 648 -> 992 bytes
 .../tools/llvm-readobj/program-headers.test   |  22 ++++++++++++++----
 llvm/tools/llvm-readobj/ELFDumper.cpp         |   1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/llvm/test/Object/Inputs/program-headers.mips b/llvm/test/Object/Inputs/program-headers.mips
index 54ebfea31f0c6bdf0884871c404832256a39a9ee..e3485b2237472cf2c447ae62baebd25309f3fd66 100755
GIT binary patch
literal 992
zcma)4O-jQ+6n<%1Z9y>VMsQ&lE<_;+7Qv0Q3k5+%@BlHPX${ymBvYs>Jw}hwqx1;5
zf(zI6`(`q<6e>P=zu%iTnJ@42_TkQP9C5@*Md~`9OIunfO)4T)Ptuk&#g$WO$QHb$
zQ(#l{P!ADPtI#?WlFndez^JP@d+c2Tj9S1_YtSXytl+auN!K@<`B!Hn$anlDon4^)
z;aHq)1l5}O`Nu$o5xmNbf3wl!{qu_-MoI5I?C0WVaX%UMM&he@qQp<TnfRFGhe~Bh
zG*)rG;bL+|aZ4u1k;yCC+i!Ns^oqEe;bp-EJ>+uv{_h0|E5z{O;rtHqaz68eHT<~5
z`Cs;dpRD2MYx%`mE<rz)pw|sm2&b6{f+){}T!opEL6{6Bhz%SMyXXOk8UK|dG@fCf
z$c))HvupM|_l^679&D!RBcI$q)~)b;%rBwj4859{IlKq8V&iKR*k`3c(6k9W=TUB;
zKa0gkCp0)@XOyXi_Fz~4riZ>KjTmF^qBmP$>aQpi2>DLEq41pFfUeGK<IojqR_wfA
D86R7*

literal 648
zcmb7AJ5Iwu5FI-|BnnbcASA>}G^Su>Oe8Q>f<>T6#|ivd92fq`UQ1AsBjgA<5=Y<&
zG}K{c*N#C{Jn7B8otd4dowxhN+%OF=pn(Z{s0^6G8qW#J#{$L!R18e8usSMqtHd5n
zfFn#1`wjKDDc*<xn}!22TH)mnW-Ic8-iPwvl^;CsmRV1EU5283WnLbMJCTJ;wn(I4
zj(zEH+r4nzb2j1E+#x?TXE&e|Cn!&67!KmBRv#Yq4dB(XlBM(m;H8L@>^TQ6#ft<U
z=4mQ26h%}5$2Z)UvP^<niVAodiJ*?TA0$`k`XB7${)YI#RQm(mq266PgLX)}JVeqS
zhs~epUt?s8Rv%-6`s}8#`JpLAHR4%w;-T=4k!h(S`4X&ryZzEq#ZQc_7bR#G;Rf02
U-;%0bje2@2qk?)e@9uiWH)S?F`2YX_

diff --git a/llvm/test/tools/llvm-readobj/program-headers.test b/llvm/test/tools/llvm-readobj/program-headers.test
index f014c0390420..8e8855d8b8e8 100644
--- a/llvm/test/tools/llvm-readobj/program-headers.test
+++ b/llvm/test/tools/llvm-readobj/program-headers.test
@@ -83,10 +83,22 @@ ELF-MIPS-NEXT: AddressSize: 32bit
 ELF-MIPS-NEXT: LoadName:
 ELF-MIPS-NEXT: ProgramHeaders [
 ELF-MIPS-NEXT:   ProgramHeader {
+ELF-MIPS-NEXT:     Type: PT_MIPS_ABIFLAGS (0x70000003)
+ELF-MIPS-NEXT:     Offset: 0x98
+ELF-MIPS-NEXT:     VirtualAddress: 0x400098
+ELF-MIPS-NEXT:     PhysicalAddress: 0x400098
+ELF-MIPS-NEXT:     FileSize: 24
+ELF-MIPS-NEXT:     MemSize: 24
+ELF-MIPS-NEXT:     Flags [ (0x4)
+ELF-MIPS-NEXT:       PF_R (0x4)
+ELF-MIPS-NEXT:     ]
+ELF-MIPS-NEXT:     Alignment: 8
+ELF-MIPS-NEXT:   }
+ELF-MIPS-NEXT:   ProgramHeader {
 ELF-MIPS-NEXT:     Type: PT_MIPS_REGINFO (0x70000000)
-ELF-MIPS-NEXT:     Offset: 0x74
-ELF-MIPS-NEXT:     VirtualAddress: 0x400074
-ELF-MIPS-NEXT:     PhysicalAddress: 0x400074
+ELF-MIPS-NEXT:     Offset: 0xB0
+ELF-MIPS-NEXT:     VirtualAddress: 0x4000B0
+ELF-MIPS-NEXT:     PhysicalAddress: 0x4000B0
 ELF-MIPS-NEXT:     FileSize: 24
 ELF-MIPS-NEXT:     MemSize: 24
 ELF-MIPS-NEXT:     Flags [ (0x4)
@@ -99,8 +111,8 @@ ELF-MIPS-NEXT:     Type: PT_LOAD (0x1)
 ELF-MIPS-NEXT:     Offset: 0x0
 ELF-MIPS-NEXT:     VirtualAddress: 0x400000
 ELF-MIPS-NEXT:     PhysicalAddress: 0x400000
-ELF-MIPS-NEXT:     FileSize: 160
-ELF-MIPS-NEXT:     MemSize: 160
+ELF-MIPS-NEXT:     FileSize: 224
+ELF-MIPS-NEXT:     MemSize: 224
 ELF-MIPS-NEXT:     Flags [ (0x5)
 ELF-MIPS-NEXT:       PF_R (0x4)
 ELF-MIPS-NEXT:       PF_X (0x1)
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 0b1063fb86ae..f096e7720d6b 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -483,6 +483,7 @@ static const char *getElfSegmentType(unsigned Arch, unsigned Type) {
     LLVM_READOBJ_ENUM_CASE(ELF, PT_MIPS_REGINFO);
     LLVM_READOBJ_ENUM_CASE(ELF, PT_MIPS_RTPROC);
     LLVM_READOBJ_ENUM_CASE(ELF, PT_MIPS_OPTIONS);
+    LLVM_READOBJ_ENUM_CASE(ELF, PT_MIPS_ABIFLAGS);
     }
   }