Resync dwarf2.{def,h} from gcc's include/, remove local defines

that are no longer needed.

diff --git a/dwarf2.def b/dwarf2.def
index 870aecdaa54442cc45f024414bea68094d4ff801..e9a8bcac0858f73d15c20e9a9f3a15f81aa5d152 100644 (file)
--- a/dwarf2.def
+++ b/dwarf2.def
@@ -205,6 +205,10 @@ DW_FORM (DW_FORM_ref_sig8, 0x20)
 /* Extensions for Fission.  See http://gcc.gnu.org/wiki/DebugFission.  */
 DW_FORM (DW_FORM_GNU_addr_index, 0x1f01)
 DW_FORM (DW_FORM_GNU_str_index, 0x1f02)
+/* Extensions for DWZ multifile.
+   See http://www.dwarfstd.org/ShowIssue.php?issue=120604.1&type=open .  */
+DW_FORM (DW_FORM_GNU_ref_alt, 0x1f20)
+DW_FORM (DW_FORM_GNU_strp_alt, 0x1f21)
 DW_END_FORM
 
 DW_FIRST_AT (DW_AT_sibling, 0x01)

diff --git a/dwarf2.h b/dwarf2.h
index 0be7a99c856b00d7e40b96585c86bb3e243c5bd2..2c1aeb6b912d969c6baaa913884644987704c0db 100644 (file)
--- a/dwarf2.h
+++ b/dwarf2.h
@@ -333,6 +333,11 @@ enum dwarf_macro_record_type
     DW_MACRO_GNU_define_indirect = 5,
     DW_MACRO_GNU_undef_indirect = 6,
     DW_MACRO_GNU_transparent_include = 7,
+    /* Extensions for DWZ multifile.
+       See http://www.dwarfstd.org/ShowIssue.php?issue=120604.1&type=open .  */
+    DW_MACRO_GNU_define_indirect_alt = 8,
+    DW_MACRO_GNU_undef_indirect_alt = 9,
+    DW_MACRO_GNU_transparent_include_alt = 10,
     DW_MACRO_GNU_lo_user = 0xe0,
     DW_MACRO_GNU_hi_user = 0xff
   };

diff --git a/dwz.c b/dwz.c
index 9fbc3dc3dfea1b6b979462f3d2740cf175f94965..487d959d6cf5bd59da47e5723769b5128ac8dbe9 100644 (file)
--- a/dwz.c
+++ b/dwz.c
@@ -94,13 +94,6 @@
    with low_mem flag set.  This can decrease memory consumption to
    half in some very large cases.  */
 
-#define DW_FORM_GNU_ref_alt    0x1f20
-#define DW_FORM_GNU_strp_alt   0x1f21
-
-#define DW_MACRO_GNU_define_indirect_alt       8
-#define DW_MACRO_GNU_undef_indirect_alt                9
-#define DW_MACRO_GNU_transparent_include_alt   10
-
 #ifndef IGNORE_LOCUS
 # define IGNORE_LOCUS 0
 #endif