From 5ae542419de15ad6f48110068c39df08b0750120 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 18 Apr 2008 15:14:13 +0000 Subject: [PATCH] merge from gcc --- intl/ChangeLog | 6 ++++++ intl/aclocal.m4 | 1 + intl/configure | 21 +++++++++++++++------ libdecnumber/ChangeLog | 6 ++++++ libdecnumber/aclocal.m4 | 1 + libdecnumber/configure | 21 +++++++++++++++------ libiberty/ChangeLog | 10 ++++++++++ libiberty/aclocal.m4 | 1 + libiberty/configure | 21 +++++++++++++++------ libiberty/testsuite/demangle-expected | 20 ++++++++++++++++++++ 10 files changed, 90 insertions(+), 18 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index 840752a024c..dcb14fb3bbd 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,9 @@ +2008-04-18 Paolo Bonzini + + PR bootstrap/35457 + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2008-03-17 Ralf Wildenhues * aclocal.m4: Regenerate. diff --git a/intl/aclocal.m4 b/intl/aclocal.m4 index d53f1db4f5a..a28ee49cb71 100644 --- a/intl/aclocal.m4 +++ b/intl/aclocal.m4 @@ -24,6 +24,7 @@ m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) m4_include([../config/nls.m4]) +m4_include([../config/override.m4]) m4_include([../config/po.m4]) m4_include([../config/proginstall.m4]) m4_include([../config/progtest.m4]) diff --git a/intl/configure b/intl/configure index b7fbd0e7ba3..09143ceb450 100755 --- a/intl/configure +++ b/intl/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/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index fefafe6bbc7..91c4f08dcaa 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,9 @@ +2008-04-18 Paolo Bonzini + + PR bootstrap/35457 + * aclocal.m4: Regenerate. + * configure: Regenerate. + 2008-04-18 Ben Elliston * Makefile.in (distclean): Add gstdint.h. diff --git a/libdecnumber/aclocal.m4 b/libdecnumber/aclocal.m4 index f35b3638d22..86be19d90dd 100644 --- a/libdecnumber/aclocal.m4 +++ b/libdecnumber/aclocal.m4 @@ -11,5 +11,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_include([../config/override.m4]) m4_include([../config/stdint.m4]) m4_include([../config/warnings.m4]) diff --git a/libdecnumber/configure b/libdecnumber/configure index 19ece0fba0e..ab73f464cbf 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -1252,13 +1252,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/ChangeLog b/libiberty/ChangeLog index 0e8424d56e8..80718252984 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,13 @@ +2008-04-18 Kris Van Hees + + * testsuite/demangle-expected: Added tests for char16_t and char32_t. + +2008-04-18 Paolo Bonzini + + PR bootstrap/35457 + * aclocal.m4: Add override.m4. + * configure: Regenerate. + 2008-03-31 Ian Lance Taylor * cp-demangle.c (d_substitution): Correct overflow check to avoid diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4 index 643939e9d78..5d050cb3bd0 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 bbe792dab64..f47833ad97b 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 7f9bc61f7b4..2745dd3d13b 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 CB -- 2.30.2