merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 83c673863831363afb8de0f4d9d34bd3a541d87c..fb1f432538d7f9aa55410f1bc4ea67fbfc3b1b87 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-04  Ian Lance Taylor  <iant@google.com>
+
+       * dwarf2.h (enum dwarf_source_language): Add DW_LANG_Go.
+
 2010-11-02  Ian Lance Taylor  <iant@google.com>
 
        * simple-object.h: New file.

diff --git a/include/dwarf2.h b/include/dwarf2.h
index fea23ad61e493c81bb8a3951e2669313baa3aafb..bd18a5465a4d4110dd246576a41d3b6bfae3efa8 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -894,6 +894,8 @@ enum dwarf_source_language
     DW_LANG_D = 0x0013,
     /* DWARF 4.  */
     DW_LANG_Python = 0x0014,
+    /* DWARF 5.  */
+    DW_LANG_Go = 0x0016,
 
     DW_LANG_lo_user = 0x8000,  /* Implementation-defined range start.  */
     DW_LANG_hi_user = 0xffff,  /* Implementation-defined range start.  */