From 88aefd2a5295e57f18b618fabeda10dc97d1e3b1 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 13 Dec 2010 18:19:43 +0000 Subject: [PATCH] backport: configure.ac (*-*-irix6*): Disable set_have_as_tls. Backport from mainline: 2010-11-02 Rainer Orth * configure.ac (*-*-irix6*): Disable set_have_as_tls. (*-*-osf*): Likewise. * configure: Regenerate. From-SVN: r167759 --- gcc/ChangeLog | 9 +++++++++ gcc/configure | 12 ++++++++++++ gcc/configure.ac | 12 ++++++++++++ 3 files changed, 33 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a9a61fa0cf3..2c796c40836e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2010-12-13 Rainer Orth + + Backport from mainline: + 2010-11-02 Rainer Orth + + * configure.ac (*-*-irix6*): Disable set_have_as_tls. + (*-*-osf*): Likewise. + * configure: Regenerate. + 2010-12-07 Jakub Jelinek PR middle-end/46534 diff --git a/gcc/configure b/gcc/configure index 64cdd91332ff..3d434a8196c3 100755 --- a/gcc/configure +++ b/gcc/configure @@ -22423,6 +22423,18 @@ if test $gcc_cv_as_tls = yes; then set_have_as_tls=yes fi fi +case "$target" in + *-*-irix6*) + # IRIX 6.5 rld and libc.so lack TLS support, so even if gas and gld + # with TLS support are in use, native TLS cannot work. + set_have_as_tls=no + ;; + *-*-osf*) + # Tru64 UNIX loader and libc.so lack TLS support, so even if gas and + # gld with TLS support are in use, native TLS cannot work. + set_have_as_tls=no + ;; +esac if test $set_have_as_tls = yes ; then cat >>confdefs.h <<\_ACEOF diff --git a/gcc/configure.ac b/gcc/configure.ac index 01b6c5634727..47f39ac7eb2b 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2838,6 +2838,18 @@ else [$tls_first_major,$tls_first_minor,0], [$tls_as_opt], [$conftest_s],, [set_have_as_tls=yes]) fi +case "$target" in + *-*-irix6*) + # IRIX 6.5 rld and libc.so lack TLS support, so even if gas and gld + # with TLS support are in use, native TLS cannot work. + set_have_as_tls=no + ;; + *-*-osf*) + # Tru64 UNIX loader and libc.so lack TLS support, so even if gas and + # gld with TLS support are in use, native TLS cannot work. + set_have_as_tls=no + ;; +esac if test $set_have_as_tls = yes ; then AC_DEFINE(HAVE_AS_TLS, 1, [Define if your assembler supports thread-local storage.]) -- 2.47.2