merge from gcc

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.

libiberty/cp-demangle.c

@@ -2271,6 +2271,11 @@ cplus_demangle_type (struct d_info *di)
 	  can_subst = 1;
 	  break;
 
+	case 'a':
+	  /* auto */
+	  ret = d_make_name (di, "auto", 4);
+	  break;
+	  
 	case 'f':
 	  /* 32-bit decimal floating point */
 	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[26]);

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)

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.
 #