diff options
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 18 insertions, 16 deletions
diff --git a/configure b/configure index ed4ee4fca0..0d31460c16 100755 --- a/configure +++ b/configure @@ -3766,8 +3766,8 @@ if eval "test \"`echo '$''{'libc_cv_gcc___thread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<\EOF - __thread int a = 42; - EOF +__thread int a = 42; +EOF if { ac_try='${CC-cc} $CFLAGS -c conftest.c >&5'; { (eval echo configure:3772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc___thread=yes else @@ -3783,18 +3783,20 @@ echo "$ac_t""$libc_cv_gcc___thread" 1>&6 EOF fi +else + libc_cv_gcc___thread=no fi if test "$libc_cv_gcc___thread" = yes; then echo $ac_n "checking for tls_model attribute""... $ac_c" 1>&6 -echo "configure:3791: checking for tls_model attribute" >&5 +echo "configure:3793: checking for tls_model attribute" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_tls_model_attr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<\EOF extern __thread int a __attribute__((tls_model ("initial-exec"))); EOF - if { ac_try='${CC-cc} $CFLAGS -S -Werror conftest.c >&5'; { (eval echo configure:3798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='${CC-cc} $CFLAGS -S -Werror conftest.c >&5'; { (eval echo configure:3800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_tls_model_attr=yes else libc_cv_gcc_tls_model_attr=no @@ -3812,7 +3814,7 @@ EOF fi echo $ac_n "checking for libgd""... $ac_c" 1>&6 -echo "configure:3816: checking for libgd" >&5 +echo "configure:3818: checking for libgd" >&5 if test "$with_gd" != "no"; then old_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $libgd_include" @@ -3821,14 +3823,14 @@ if test "$with_gd" != "no"; then old_LIBS="$LIBS" LIBS="$LIBS -lgd -lpng -lz -lm" cat > conftest.$ac_ext <<EOF -#line 3825 "configure" +#line 3827 "configure" #include "confdefs.h" #include <gd.h> int main() { gdImagePng (0, 0) ; return 0; } EOF -if { (eval echo configure:3832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBGD=yes else @@ -3848,7 +3850,7 @@ echo "$ac_t""$LIBGD" 1>&6 echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:3852: checking size of long double" >&5 +echo "configure:3854: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3856,7 +3858,7 @@ else ac_cv_sizeof_long_double=0 else cat > conftest.$ac_ext <<EOF -#line 3860 "configure" +#line 3862 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -3867,7 +3869,7 @@ int main() return(0); } EOF -if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -3945,7 +3947,7 @@ if test "$uname" = "sysdeps/generic"; then fi echo $ac_n "checking OS release for uname""... $ac_c" 1>&6 -echo "configure:3949: checking OS release for uname" >&5 +echo "configure:3951: checking OS release for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3967,7 +3969,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6 uname_release="$libc_cv_uname_release" echo $ac_n "checking OS version for uname""... $ac_c" 1>&6 -echo "configure:3971: checking OS version for uname" >&5 +echo "configure:3973: checking OS version for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3996,7 +3998,7 @@ EOF # Test for old glibc 2.0.x headers so that they can be removed properly # Search only in includedir. echo $ac_n "checking for old glibc 2.0.x headers""... $ac_c" 1>&6 -echo "configure:4000: checking for old glibc 2.0.x headers" >&5 +echo "configure:4002: checking for old glibc 2.0.x headers" >&5 if eval test -f "${includedir}/elfclass.h" -a -f "${includedir}/fcntlbits.h" then old_glibc_headers=yes @@ -4057,7 +4059,7 @@ if test $shared = default; then fi echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6 -echo "configure:4061: checking whether -fPIC is default" >&5 +echo "configure:4063: checking whether -fPIC is default" >&5 if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/configure.in b/configure.in index 5ed4faa1f7..63e2da2a6d 100644 --- a/configure.in +++ b/configure.in @@ -1617,8 +1617,8 @@ dnl Check whether the compiler supports the __thread keyword. if test "x$use__thread" != xno; then AC_CACHE_CHECK([for __thread], libc_cv_gcc___thread, [cat > conftest.c <<\EOF - __thread int a = 42; - EOF +__thread int a = 42; +EOF if AC_TRY_COMMAND([${CC-cc} $CFLAGS -c conftest.c >&AC_FD_CC]); then libc_cv_gcc___thread=yes else |