aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-09-26 00:01:16 +0000
committerDJ Delorie <dj@redhat.com>2009-09-26 00:01:16 +0000
commit39236edf0673953bea1f931718c68b966817225e (patch)
treec9c646eb16d6bd44b48a5d45cf14f180aea43dfc /include
parent661f3447b6275b86ac84c6a4f3a75bbabee8808b (diff)
downloadgdb-39236edf0673953bea1f931718c68b966817225e.zip
gdb-39236edf0673953bea1f931718c68b966817225e.tar.gz
gdb-39236edf0673953bea1f931718c68b966817225e.tar.bz2
merge from gcc
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog6
-rw-r--r--include/dwarf2.h15
2 files changed, 13 insertions, 8 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 9bff2e6..db95d46 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-25 Dodji Seketeli <dodji@redhat.com>
+
+ * dwarf2.h (enum dwarf_tag): Rename DW_TAG_template_parameter_pack and
+ DW_TAG_formal_parameter_pack into DW_TAG_GNU_template_parameter_pack
+ and DW_TAG_formal_parameter_pack until DWARF 5 is out.
+
2009-09-25 Cary Coutant <ccoutant@google.com>
Add rest of new values from DWARF Version 4.
diff --git a/include/dwarf2.h b/include/dwarf2.h
index 4aa10d5..385ab22 100644
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -202,14 +202,6 @@ enum dwarf_tag
DW_TAG_lo_user = 0x4080,
DW_TAG_hi_user = 0xffff,
- /* DWARF 5? */
-
- /* Template parameter pack extension, specified at
- http://wiki.dwarfstd.org/index.php?title=C%2B%2B0x:_Variadic_templates
- . */
- DW_TAG_template_parameter_pack = 0x43,
- DW_TAG_formal_parameter_pack = 0x44,
-
/* SGI/MIPS Extensions. */
DW_TAG_MIPS_loop = 0x4081,
/* HP extensions. See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz . */
@@ -223,6 +215,13 @@ enum dwarf_tag
/* Template template parameter.
See http://gcc.gnu.org/wiki/TemplateParmsDwarf . */
DW_TAG_GNU_template_template_param = 0x4106,
+
+ /* Template parameter pack extension, specified at
+ http://wiki.dwarfstd.org/index.php?title=C%2B%2B0x:_Variadic_templates
+ The values of these two TAGS are in the DW_TAG_GNU_* space until the tags
+ are properly part of DWARF 5. */
+ DW_TAG_GNU_template_parameter_pack = 0x4107,
+ DW_TAG_GNU_formal_parameter_pack = 0x4108,
/* Extensions for UPC. See: http://upc.gwu.edu/~upc. */
DW_TAG_upc_shared_type = 0x8765,
DW_TAG_upc_strict_type = 0x8766,