From e7d5b5b9c426b3b2f64c49d8a0eac9ab9d3b0c57 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 17 Jul 2009 16:08:36 +0100 Subject: [PATCH] re PR other/40784 (Revision 149725 caused autoconf warning in libstdc++) PR other/40784 config: * tls.m4 (GCC_CHECK_TLS): Add extra quoting around argument to AC_LINK_IFELSE. libjava: * configure: Regenerate. libstdc++-v3: * configure: Regenerate. From-SVN: r149748 --- config/ChangeLog | 6 ++++++ config/tls.m4 | 4 ++-- libjava/ChangeLog | 5 +++++ libjava/configure | 4 ++-- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/configure | 12 ++++++------ 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 6f20dd8b328..6bd7bbf5416 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2009-07-17 Joseph Myers + + PR other/40784 + * tls.m4 (GCC_CHECK_TLS): Add extra quoting around argument to + AC_LINK_IFELSE. + 2009-07-16 Joseph Myers * tls.m4 (GCC_CHECK_TLS): Also test TLS in a shared library when diff --git a/config/tls.m4 b/config/tls.m4 index e0870682d51..099bdc257a8 100644 --- a/config/tls.m4 +++ b/config/tls.m4 @@ -79,9 +79,9 @@ AC_DEFUN([GCC_CHECK_TLS], [ CFLAGS="-fPIC $CFLAGS" dnl If -shared works, test if TLS works in a shared library. AC_LINK_IFELSE([int f() { return 0; }], - AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], + [AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], [gcc_cv_have_tls=yes], - [gcc_cv_have_tls=no]), + [gcc_cv_have_tls=no])], [gcc_cv_have_tls=yes]) CFLAGS="$chktls_save_CFLAGS" LDFLAGS="$chktls_save_LDFLAGS"], [gcc_cv_have_tls=no]) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 22feaedf7d5..d838e26fabe 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2009-07-17 Joseph Myers + + PR other/40784 + * configure: Regenerate. + 2009-07-16 Joseph Myers * configure: Regenerate. diff --git a/libjava/configure b/libjava/configure index 82911d155ac..9206e9153ca 100755 --- a/libjava/configure +++ b/libjava/configure @@ -27702,8 +27702,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test x$gcc_no_link = xyes; then - { { echo "$as_me:$LINENO: error: Link tests are not allowed after ." >&5 -echo "$as_me: error: Link tests are not allowed after ." >&2;} + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} { (exit 1); exit 1; }; } fi cat >conftest.$ac_ext <<_ACEOF diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f7656a393f6..4beeae38e62 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-07-17 Joseph Myers + + PR other/40784 + * configure: Regenerate. + 2009-07-16 Benjamin Kosnik * testsuite/util/testsuite_common_types.h (standard_layout): Activate. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index d9e9f8df5f1..13f477ed34b 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -40770,8 +40770,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test x$gcc_no_link = xyes; then - { { echo "$as_me:$LINENO: error: Link tests are not allowed after ." >&5 -echo "$as_me: error: Link tests are not allowed after ." >&2;} + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} { (exit 1); exit 1; }; } fi cat >conftest.$ac_ext <<_ACEOF @@ -94505,8 +94505,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test x$gcc_no_link = xyes; then - { { echo "$as_me:$LINENO: error: Link tests are not allowed after ." >&5 -echo "$as_me: error: Link tests are not allowed after ." >&2;} + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} { (exit 1); exit 1; }; } fi cat >conftest.$ac_ext <<_ACEOF @@ -112207,8 +112207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test x$gcc_no_link = xyes; then - { { echo "$as_me:$LINENO: error: Link tests are not allowed after ." >&5 -echo "$as_me: error: Link tests are not allowed after ." >&2;} + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} { (exit 1); exit 1; }; } fi cat >conftest.$ac_ext <<_ACEOF