From: DJ Delorie <dj@redhat.com>
Date: Mon, 13 Jun 2011 23:01:42 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: sid-snapshot-20110701~25
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e75cc8b1d0af615ce262e2d865fec80b58e06950;p=newlib-cygwin.git

merge from gcc
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 820c6965f..42546be66 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* demangle.h (DMGL_RET_POSTFIX): Extend the comment.
+	(DMGL_RET_DROP): New.
+
 2011-06-13  Walter Lee  <walt@tilera.com>
 
 	* dis-asm.h (print_insn_tilegx): Declare.
diff --git a/include/demangle.h b/include/demangle.h
index c0624559e..53f6c54f5 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -45,7 +45,13 @@ extern "C" {
 #define DMGL_VERBOSE	 (1 << 3)	/* Include implementation details.  */
 #define DMGL_TYPES	 (1 << 4)	/* Also try to demangle type encodings.  */
 #define DMGL_RET_POSTFIX (1 << 5)       /* Print function return types (when
-                                           present) after function signature */
+					   present) after function signature.
+					   It applies only to the toplevel
+					   function type.  */
+#define DMGL_RET_DROP	 (1 << 6)       /* Suppress printing function return
+					   types, even if present.  It applies
+					   only to the toplevel function type.
+					   */
 
 #define DMGL_AUTO	 (1 << 8)
 #define DMGL_GNU	 (1 << 9)