merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 811decd7e09849b03b5d811a1ad04f3e154e40f2..5bc501a54df7a7c59bc33a64224067628ffd434e 100644 (file)
--- 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

diff --git a/include/dwarf2.h b/include/dwarf2.h
index 385ab2256fabb0a983371c7b6b03e292bb418671..7a8e030a2bf2efeb6611fec28bec198fb05d7b70 100644 (file)
--- 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.  */