diff options
| author | DJ Delorie <dj@redhat.com> | 2012-04-02 18:50:29 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2012-04-02 18:50:29 +0000 |
| commit | 24e829d00750e3689217fcb1d1084c8c21e6352f (patch) | |
| tree | 2ffb91e692241e7b793995a60d07b94ef5f0d283 | |
| parent | cf9bb588b31c141fce2c153df81d26fbd5c271d1 (diff) | |
| download | gdb-24e829d00750e3689217fcb1d1084c8c21e6352f.zip gdb-24e829d00750e3689217fcb1d1084c8c21e6352f.tar.gz gdb-24e829d00750e3689217fcb1d1084c8c21e6352f.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 9 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 5 | ||||
| -rw-r--r-- | libiberty/stack-limit.c | 3 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 6 |
4 files changed, 22 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 97bdfed..4a3f803 100644 --- 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 2b3d182..d95b56c 100644 --- 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 e64cac2..82c3d44 100644 --- 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 036c481..d489692 100644 --- 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. # |