From 2ce29d92faa5da16996297d953b389d1d681b5a5 Mon Sep 17 00:00:00 2001 From: Eli Bendersky Date: Tue, 25 Oct 2016 20:07:43 -0700 Subject: [PATCH] Remove the PT_ARM_UNWIND enum According to the ARM ABI it's an alias for PT_ARM_EXIDX; having them both in the same enum value confuses parsing. Keeping EXIDX rather than UNWIND because binutils seems to be using it. Related to #121 --- elftools/dwarf/structs.py | 1 - elftools/elf/descriptions.py | 1 - elftools/elf/enums.py | 1 - 3 files changed, 3 deletions(-) diff --git a/elftools/dwarf/structs.py b/elftools/dwarf/structs.py index e25dc84..bdd79da 100644 --- a/elftools/dwarf/structs.py +++ b/elftools/dwarf/structs.py @@ -139,7 +139,6 @@ class DWARFStructs(object): # Adapts a Struct that parses forward a full initial length field. # Only if the first word is the continuation value, the second # word is parsed from the stream. - # return _InitialLengthAdapter( Struct(name, self.Dwarf_uint32('first'), diff --git a/elftools/elf/descriptions.py b/elftools/elf/descriptions.py index f085b87..cda6e33 100644 --- a/elftools/elf/descriptions.py +++ b/elftools/elf/descriptions.py @@ -217,7 +217,6 @@ _DESCR_P_TYPE = dict( PT_GNU_RELRO='GNU_RELRO', PT_ARM_ARCHEXT='ARM_ARCHEXT', PT_ARM_EXIDX='ARM_EXIDX', - PT_ARM_UNWIND='ARM_UNWIND', PT_AARCH64_ARCHEXT='AARCH64_ARCHEXT', PT_AARCH64_UNWIND='AARCH64_UNWIND', ) diff --git a/elftools/elf/enums.py b/elftools/elf/enums.py index dbeb20e..ddae433 100644 --- a/elftools/elf/enums.py +++ b/elftools/elf/enums.py @@ -259,7 +259,6 @@ ENUM_P_TYPE = dict( PT_GNU_RELRO=0x6474e552, PT_ARM_ARCHEXT=0x70000000, PT_ARM_EXIDX=0x70000001, - PT_ARM_UNWIND=0x70000001, PT_AARCH64_ARCHEXT=0x70000000, PT_AARCH64_UNWIND=0x70000001, _default_=Pass, -- 2.30.2