From 3fce87a0af66972aceace34a6a5a9ce0aab81dcb Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Thu, 15 Oct 2009 17:03:34 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog | 5 +++++
 include/dwarf2.h  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/include/ChangeLog b/include/ChangeLog
index 811decd7e0..5bc501a54d 100644
--- 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 385ab2256f..7a8e030a2b 100644
--- 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.  */