From 3791ab4cd597d6866733164a3db2c5612c0e2a40 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 8 Jun 2012 19:01:23 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 8 ++++++++ include/dwarf2.def | 4 ++++ include/dwarf2.h | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index e2a420f28..6f6066e17 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,11 @@ +2012-06-08 Jakub Jelinek + + * dwarf2.def (DW_FORM_GNU_ref_alt, DW_FORM_GNU_strp_alt): New + forms. + * dwarf2.h (enum dwarf_macro_record_type): Add + DW_MACRO_GNU_define_indirect_alt, DW_MACRO_GNU_undef_indirect_alt + and DW_MACRO_GNU_transparent_include_alt. + 2012-05-23 Doug Evans * leb128.h: #include stdint.h, inttypes.h. diff --git a/include/dwarf2.def b/include/dwarf2.def index 870aecdaa..e9a8bcac0 100644 --- a/include/dwarf2.def +++ b/include/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/include/dwarf2.h b/include/dwarf2.h index 0be7a99c8..2c1aeb6b9 100644 --- a/include/dwarf2.h +++ b/include/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 };