diff options
| author | Eric Botcazou <ebotcazou@libertysurf.fr> | 2006-12-04 11:10:38 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@libertysurf.fr> | 2006-12-04 11:10:38 +0000 |
| commit | 4ab0987fac1c2f995d83379f1d59fdf6e3989db6 (patch) | |
| tree | 38c687216b40ee374097b4fbb790fb3131adfdc3 /libgomp | |
| parent | 146681c8dc03a8d61d2703a466c22830de7427c3 (diff) | |
config/
* tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking
if static linking doesn't even work.
libgomp/
* configure: Regenerate.
libmudflap/
* configure: Regenerate.
libjava/
* configure: Regenerate.
libstdc++-v3/
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@119487 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 4 | ||||
| -rwxr-xr-x | libgomp/configure | 37 |
2 files changed, 39 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 7d6cce68a98..e704b2356f1 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2006-12-04 Eric Botcazou <ebotcazou@libertysurf.fr> + + * configure: Regenerate. + 2006-12-04 Jakub Jelinek <jakub@redhat.com> PR libgomp/29947 diff --git a/libgomp/configure b/libgomp/configure index c35e84d9230..e8b0edabeeb 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -8894,9 +8894,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS="$LDFLAGS" LDFLAGS="-static $LDFLAGS" - if test "$cross_compiling" = yes; then + cat >conftest.$ac_ext <<_ACEOF +int main() { return 0; } +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling @@ -8928,6 +8953,14 @@ have_tls=no fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +have_tls=yes +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else echo "$as_me: program exited with status $ac_status" >&5 |