* 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.

diff --git a/config/ChangeLog b/config/ChangeLog
index d1ee4bc7cb878ed72593c6a7e04014d4122f4404..84db8b2f3c09986561f50b49c0d11d359683651f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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>
 
        * no-executables.m4 (GCC_TRY_COMPILE_OR_LINK): New function.

diff --git a/config/tls.m4 b/config/tls.m4
index 69cf6d4f9d2b6096d87c83676cb1d5f834a55582..b6c4c4a6a7da5677506dcf92f3928c9891e311b6 100644 (file)
--- a/config/tls.m4
+++ b/config/tls.m4
@@ -2,7 +2,7 @@ dnl Check whether the target supports TLS.
 AC_DEFUN([GCC_CHECK_TLS], [
   GCC_ENABLE(tls, yes, [], [Use 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; }],
       [dnl If the test case passed with dynamic linking, try again with
        dnl static linking, but only if static linking is supported (not
@@ -11,10 +11,10 @@ AC_DEFUN([GCC_CHECK_TLS], [
       LDFLAGS="-static $LDFLAGS"
       AC_LINK_IFELSE([int main() { return 0; }],
        AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
-                     [have_tls=yes], [have_tls=no],[]),
-       [have_tls=yes])
+                     [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[]),
+       [gcc_cv_have_tls=yes])
       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 Also check whether the libc supports TLS, i.e. whether a variable
        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))
                  return 0;
                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"
        fi
       fi],
-      [have_tls=no],
+      [gcc_cv_have_tls=no],
       [dnl This is the cross-compiling case. Assume libc supports TLS if the
        dnl binutils and the compiler do.
        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,
              [Define to 1 if the target supports thread-local storage.])
   fi])
@@ -78,11 +78,11 @@ dnl Check whether the target assembler supports TLS.
 AC_DEFUN([GCC_CHECK_CC_TLS], [
   GCC_ENABLE(tls, yes, [], [Use 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; }],
-      [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,
              [Define to 1 if the target assembler supports thread-local storage.])
   fi])