merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 9e6fb590dd67c118f295a3152995aa4e42263f03..b9aef7f789e84bb79b80a130c5ea480822e866e2 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-22  Dodji Seketeli  <dodji@redhat.com>
+
+       * dwarf2.h (enum dwarf_tag): Add
+       DW_TAG_template_parameter_pack and DW_TAG_formal_parameter_pack.
+
 2009-09-09  Martin Thuresson  <martin@mtme.org>
 
        * bfdlink.h (struct bfd_link_hash_common_entry): Move to top

diff --git a/include/dwarf2.h b/include/dwarf2.h
index befaceb7ebe419fbd352efc25126e7c63cc28700..608f7b5d84943df4a65f71418ce424d65d415f13 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -200,6 +200,14 @@ 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 .  */