Merge pull request gimli-rs#525 from khuey/gnu-extensions

Pick up non-standard GNU extension attributes when looking for address and range list bases.
RReverser · Jul 6, 2020 · 6597ad2 · 6597ad2
2 parents 3408a50 + 81631d6
commit 6597ad2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/read/dwarf.rs b/src/read/dwarf.rs
@@ -563,7 +563,7 @@ impl<R: Reader> Unit<R> {
                             unit.str_offsets_base = base;
                         }
                     }
-                    constants::DW_AT_addr_base => {
+                    constants::DW_AT_addr_base | constants::DW_AT_GNU_addr_base => {
                         if let AttributeValue::DebugAddrBase(base) = attr.value() {
                             unit.addr_base = base;
                         }
@@ -573,7 +573,7 @@ impl<R: Reader> Unit<R> {
                             unit.loclists_base = base;
                         }
                     }
-                    constants::DW_AT_rnglists_base => {
+                    constants::DW_AT_rnglists_base | constants::DW_AT_GNU_ranges_base => {
                         if let AttributeValue::DebugRngListsBase(base) = attr.value() {
                             unit.rnglists_base = base;
                         }

diff --git a/src/read/unit.rs b/src/read/unit.rs
@@ -1654,10 +1654,12 @@ impl<R: Reader> Attribute<R> {
             constants::DW_AT_str_offsets_base => {
                 stroffsetsptr!();
             }
-            constants::DW_AT_addr_base => {
+            constants::DW_AT_addr_base |
+            constants::DW_AT_GNU_addr_base => {
                 addrptr!();
             }
-            constants::DW_AT_rnglists_base => {
+            constants::DW_AT_rnglists_base |
+            constants::DW_AT_GNU_ranges_base => {
                 rnglistsptr!();
             }
             constants::DW_AT_dwo_name => {