merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 820c6965f7a996dbabae9332f831a0e175d2b89b..42546be664b29ae085364fe3338c11bbe47ab6ae 100644 (file)
--- 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 c0624559ee2055d995a1e98109a13359ba363cf8..53f6c54f52466b0e8073b3b5e208d66668359d1c 100644 (file)
--- 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)