merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 1cff893..c96d358 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-12  Iain Sandoe  <iains@gcc.gnu.org>
+
+       * dwarf2.h: Update value for DW_AT_hi_user.
+
 2010-11-25  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * opcode/s390.h (enum s390_opcode_cpu_val): Add S390_OPCODE_MAXCPU.

diff --git a/include/dwarf2.h b/include/dwarf2.h
index bd18a54..ad00aac 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -377,7 +377,7 @@ enum dwarf_attribute
     DW_AT_linkage_name    = 0x6e,
 
     DW_AT_lo_user = 0x2000,    /* Implementation-defined range start.  */
-    DW_AT_hi_user = 0x3ff0,    /* Implementation-defined range end.  */
+    DW_AT_hi_user = 0x3fff,    /* Implementation-defined range end.  */
 
     /* SGI/MIPS extensions.  */
     DW_AT_MIPS_fde = 0x2001,