merge from gcc

2009-10-15 17:03:34 +00:00
parent 175e39bb7f
commit 1612945c43
2 changed files with 6 additions and 0 deletions
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/dwarf2.h (DW_LANG_Python): Add comment that it is
+	a DWARF 4 addition.
+
 2009-10-14  Alan Modra  <amodra@bigpond.net.au>

 	* bfdlink.h (enum bfd_link_common_skip_ar_symbols): Rename from
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -858,6 +858,7 @@ enum dwarf_source_language
    DW_LANG_ObjC_plus_plus = 0x0011,
    DW_LANG_UPC = 0x0012,
    DW_LANG_D = 0x0013,
+    /* DWARF 4.  */
    DW_LANG_Python = 0x0014,

    DW_LANG_lo_user = 0x8000,	/* Implementation-defined range start.  */