merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 97bdfed4cc6d7add41b8b41e1471b5f5b4a31205..4a3f8034892f6c84bdc6c038c01357709686fef7 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-02  Tristan Gingold  <gingold@adacore.com>
+
+       * stack-limit.c: Includes ansidecl.h.
+       (stack_limit_increase): Add ATTRIBUTE_UNUSED
+
+2012-03-20  Jason Merrill  <jason@redhat.com>
+
+       * cp-demangle.c (cplus_demangle_type): Handle 'auto'.
+
 2012-03-07  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (cplus_demangle_operators): Add li.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 2b3d1820c6089ca55b489e6124e41bb1d6585360..d95b56c71a9cae2bb3b9842c28885ca8173b9a20 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2270,6 +2270,11 @@ cplus_demangle_type (struct d_info *di)
                             cplus_demangle_type (di), NULL);
          can_subst = 1;
          break;
+
+       case 'a':
+         /* auto */
+         ret = d_make_name (di, "auto", 4);
+         break;
          
        case 'f':
          /* 32-bit decimal floating point */

diff --git a/libiberty/stack-limit.c b/libiberty/stack-limit.c
index e64cac28d1df23c5285cc579610ee5b089f54d8c..82c3d44498eeeee66f45b0dc3ac39dd1bf3b72b7 100644 (file)
--- a/libiberty/stack-limit.c
+++ b/libiberty/stack-limit.c
@@ -34,6 +34,7 @@ Attempt to increase stack size limit to @var{pref} bytes if possible.
 */
 
 #include "config.h"
+#include "ansidecl.h"
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
@@ -43,7 +44,7 @@ Attempt to increase stack size limit to @var{pref} bytes if possible.
 #endif
 
 void
-stack_limit_increase (unsigned long pref)
+stack_limit_increase (unsigned long pref ATTRIBUTE_UNUSED)
 {
 #if defined(HAVE_SETRLIMIT) && defined(HAVE_GETRLIMIT) \
     && defined(RLIMIT_STACK) && defined(RLIM_INFINITY)

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 036c481351377e32d62fb0aeb132f4e7bce58d16..d489692f0b646ece74615ce0ad6c30c6aab84cc9 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -4075,6 +4075,12 @@ decltype (new int{}) f1<int>(int)
 --format=gnu-v3
 _Zli2_wPKc
 operator"" _w(char const*)
+--format=gnu-v3
+_Z1fIiEDTnw_Dapifp_EET_
+decltype (new auto({parm#1})) f<int>(int)
+--format=gnu-v3
+_Z1fIiERDaRKT_S1_
+auto& f<int>(int const&, int)
 #
 # Ada (GNAT) tests.
 #