diff options
| author | DJ Delorie <dj@delorie.com> | 2008-04-18 15:14:13 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2008-04-18 15:14:13 +0000 |
| commit | 4d0f1e708116f659eeb2946ac92f9f6e2b11710f (patch) | |
| tree | 0a3693ca8af001a1b26c55f4599272e40000b803 /libiberty | |
| parent | 29dbe0975ec62d928bf2a52287135c17767d35f5 (diff) | |
| download | binutils-redhat-4d0f1e708116f659eeb2946ac92f9f6e2b11710f.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 10 | ||||
| -rw-r--r-- | libiberty/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | libiberty/configure | 21 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 20 |
4 files changed, 46 insertions, 6 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 0e8424d56e..8071825298 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,13 @@ +2008-04-18 Kris Van Hees <kris.van.hees@oracle.com> + + * testsuite/demangle-expected: Added tests for char16_t and char32_t. + +2008-04-18 Paolo Bonzini <bonzini@gnu.org> + + PR bootstrap/35457 + * aclocal.m4: Add override.m4. + * configure: Regenerate. + 2008-03-31 Ian Lance Taylor <iant@google.com> * cp-demangle.c (d_substitution): Correct overflow check to avoid diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4 index 643939e9d7..5d050cb3bd 100644 --- a/libiberty/aclocal.m4 +++ b/libiberty/aclocal.m4 @@ -1,5 +1,6 @@ sinclude(../config/acx.m4) sinclude(../config/no-executables.m4) +sinclude(../config/override.m4) sinclude(../config/warnings.m4) dnl See whether strncmp reads past the end of its string parameters. diff --git a/libiberty/configure b/libiberty/configure index bbe792dab6..f47833ad97 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -1251,13 +1251,22 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: + else + { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +echo "$as_me: former value: \`$ac_old_val'" >&2;} + { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 7f9bc61f7b..2745dd3d13 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -3399,6 +3399,26 @@ foo(char) foo # --format=gnu-v3 --no-params +_Z2f0u8char16_t +f0(char16_t) +f0 +# +--format=gnu-v3 --no-params +_Z2f0Pu8char16_t +f0(char16_t*) +f0 +# +--format=gnu-v3 --no-params +_Z2f0u8char32_t +f0(char32_t) +f0 +# +--format=gnu-v3 --no-params +_Z2f0Pu8char32_t +f0(char32_t*) +f0 +# +--format=gnu-v3 --no-params 2CBIL_Z3foocEE CB<foo(char)> CB<foo(char)> |