* tls.m4 (GCC_CHECK_TLS): Rename have_tls to gcc_cv_have_tls.

(GCC_CHECK_CC_TLS): Rename have_cc_tls to gcc_cv_have_cc_tls.
This commit is contained in:
Maciej W. Rozycki 2007-10-16 10:45:50 +00:00
parent 8eea1bd714
commit 81e857de3f
2 changed files with 16 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2007-10-15 Maciej W. Rozycki <macro@linux-mips.org>
* tls.m4 (GCC_CHECK_TLS): Rename have_tls to gcc_cv_have_tls.
(GCC_CHECK_CC_TLS): Rename have_cc_tls to gcc_cv_have_cc_tls.
2007-10-03 Richard Sandiford <richard@codesourcery.com> 2007-10-03 Richard Sandiford <richard@codesourcery.com>
* no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function. * no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function.

View File

@ -2,7 +2,7 @@ dnl Check whether the target supports TLS.
AC_DEFUN([GCC_CHECK_TLS], [ AC_DEFUN([GCC_CHECK_TLS], [
GCC_ENABLE(tls, yes, [], [Use thread-local storage]) GCC_ENABLE(tls, yes, [], [Use thread-local storage])
AC_CACHE_CHECK([whether the target supports thread-local storage], AC_CACHE_CHECK([whether the target supports thread-local storage],
have_tls, [ gcc_cv_have_tls, [
AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
[dnl If the test case passed with dynamic linking, try again with [dnl If the test case passed with dynamic linking, try again with
dnl static linking, but only if static linking is supported (not dnl static linking, but only if static linking is supported (not
@ -11,10 +11,10 @@ AC_DEFUN([GCC_CHECK_TLS], [
LDFLAGS="-static $LDFLAGS" LDFLAGS="-static $LDFLAGS"
AC_LINK_IFELSE([int main() { return 0; }], AC_LINK_IFELSE([int main() { return 0; }],
AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
[have_tls=yes], [have_tls=no],[]), [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[]),
[have_tls=yes]) [gcc_cv_have_tls=yes])
LDFLAGS="$chktls_save_LDFLAGS" LDFLAGS="$chktls_save_LDFLAGS"
if test $have_tls = yes; then if test $gcc_cv_have_tls = yes; then
dnl So far, the binutils and the compiler support TLS. dnl So far, the binutils and the compiler support TLS.
dnl Also check whether the libc supports TLS, i.e. whether a variable dnl Also check whether the libc supports TLS, i.e. whether a variable
dnl with __thread linkage has a different address in different threads. dnl with __thread linkage has a different address in different threads.
@ -58,18 +58,18 @@ AC_DEFUN([GCC_CHECK_TLS], [
if (pthread_join (thread, &thread_retval)) if (pthread_join (thread, &thread_retval))
return 0; return 0;
return (a_in_other_thread == a_in_main_thread);])], return (a_in_other_thread == a_in_main_thread);])],
[have_tls=yes], [have_tls=no], []) [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no], [])
CFLAGS="$chktls_save_CFLAGS" CFLAGS="$chktls_save_CFLAGS"
fi fi
fi], fi],
[have_tls=no], [gcc_cv_have_tls=no],
[dnl This is the cross-compiling case. Assume libc supports TLS if the [dnl This is the cross-compiling case. Assume libc supports TLS if the
dnl binutils and the compiler do. dnl binutils and the compiler do.
AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
[have_tls=yes], [have_tls=no]) [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no])
] ]
)]) )])
if test "$enable_tls $have_tls" = "yes yes"; then if test "$enable_tls $gcc_cv_have_tls" = "yes yes"; then
AC_DEFINE(HAVE_TLS, 1, AC_DEFINE(HAVE_TLS, 1,
[Define to 1 if the target supports thread-local storage.]) [Define to 1 if the target supports thread-local storage.])
fi]) fi])
@ -78,11 +78,11 @@ dnl Check whether the target assembler supports TLS.
AC_DEFUN([GCC_CHECK_CC_TLS], [ AC_DEFUN([GCC_CHECK_CC_TLS], [
GCC_ENABLE(tls, yes, [], [Use thread-local storage]) GCC_ENABLE(tls, yes, [], [Use thread-local storage])
AC_CACHE_CHECK([whether the target asssembler upports thread-local storage], AC_CACHE_CHECK([whether the target asssembler upports thread-local storage],
have_cc_tls, [ gcc_cv_have_cc_tls, [
AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }], AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
[have_cc_tls=yes], [have_cc_tls=no])] [gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])]
)]) )])
if test "$enable_tls $have_cc_tls" = "yes yes"; then if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
AC_DEFINE(HAVE_CC_TLS, 1, AC_DEFINE(HAVE_CC_TLS, 1,
[Define to 1 if the target assembler supports thread-local storage.]) [Define to 1 if the target assembler supports thread-local storage.])
fi]) fi])