From 2b1f7c7f029e535e85c91f56f3ab796d64c85854 Mon Sep 17 00:00:00 2001
From: AG <github@mzpqnxow.com>
Date: Sun, 26 Nov 2017 16:41:04 -0500
Subject: [PATCH] Arm exidx (#172)

* Fix merge conflicts for ABIFLAGS branch

* Fix EXIDX output to match binutils readelf -e
---
 elftools/elf/descriptions.py | 7 ++++---
 elftools/elf/enums.py        | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/elftools/elf/descriptions.py b/elftools/elf/descriptions.py
index b40f947..f8b6f9b 100644
--- a/elftools/elf/descriptions.py
+++ b/elftools/elf/descriptions.py
@@ -279,10 +279,11 @@ _DESCR_P_TYPE = dict(
     PT_GNU_STACK='GNU_STACK',
     PT_GNU_RELRO='GNU_RELRO',
     PT_ARM_ARCHEXT='ARM_ARCHEXT',
-    PT_ARM_EXIDX='ARM_EXIDX',
+    PT_ARM_EXIDX='EXIDX',  # binutils calls this EXIDX, not ARM_EXIDX
     PT_AARCH64_ARCHEXT='AARCH64_ARCHEXT',
     PT_AARCH64_UNWIND='AARCH64_UNWIND',
-    PT_TLS='TLS'
+    PT_TLS='TLS',
+    PT_MIPS_ABIFLAGS='ABIFLAGS'
 )
 
 
@@ -317,7 +318,7 @@ _DESCR_SH_TYPE = dict(
     SHT_GNU_verneed='VERNEED',
     SHT_GNU_versym='VERSYM',
     SHT_GNU_LIBLIST='GNU_LIBLIST',
-    SHT_ARM_EXIDX='ARM_EXIDX',
+    SHT_ARM_EXIDX='EXIDX',  # binutils calls this EXIDX, not ARM_EXIDX
     SHT_ARM_PREEMPTMAP='ARM_PREEMPTMAP',
     SHT_ARM_ATTRIBUTES='ARM_ATTRIBUTES',
     SHT_ARM_DEBUGOVERLAY='ARM_DEBUGOVERLAY',
diff --git a/elftools/elf/enums.py b/elftools/elf/enums.py
index dede762..380cd2c 100644
--- a/elftools/elf/enums.py
+++ b/elftools/elf/enums.py
@@ -373,6 +373,7 @@ ENUM_P_TYPE = dict(
     PT_ARM_EXIDX=0x70000001,
     PT_AARCH64_ARCHEXT=0x70000000,
     PT_AARCH64_UNWIND=0x70000001,
+    PT_MIPS_ABIFLAGS=0x70000003,
     _default_=Pass,
 )
 
-- 
2.30.2