From 8d4b5a8a50fad0ed1005380aa8d1c13dcfdab08d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 7 Feb 2002 06:38:57 +0000
Subject: Update.

2002-02-06  Ulrich Drepper  <drepper@redhat.com>

	* configure.in: Add --without-tls option.
	* sysdeps/i386/elf/configure.in: Don't check for TLS support if
	--without-tls is given.

	* sysdeps/generic/dl-tls.c: Include <tls.h>.

	* sysdeps/i386/dl-tls.h: Don't define anything if !USE_TLS.
---
 sysdeps/i386/elf/configure    | 6 ++++--
 sysdeps/i386/elf/configure.in | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'sysdeps/i386')

diff --git a/sysdeps/i386/elf/configure b/sysdeps/i386/elf/configure
index ca7f567bcb..1033f78ef3 100755
--- a/sysdeps/i386/elf/configure
+++ b/sysdeps/i386/elf/configure
@@ -1,9 +1,10 @@
  # Local configure fragment for sysdeps/unix/sysv/linux.
 
+if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
 echo $ac_n "checking for i386 TLS support""... $ac_c" 1>&6
-echo "configure:7: checking for i386 TLS support" >&5
+echo "configure:8: checking for i386 TLS support" >&5
 if eval "test \"`echo '$''{'libc_cv_386_tls'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -20,7 +21,7 @@ baz:	leal	bar@TLSLDM(%ebx), %eax
 	subl	foo@GOTTPOFF(%edx), %eax
 	subl	$bar@TPOFF, %eax
 EOF
-if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:24: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:25: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
   libc_cv_386_tls=yes
 else
   libc_cv_386_tls=no
@@ -35,3 +36,4 @@ if test $libc_cv_386_tls = yes; then
 EOF
 
 fi
+fi
diff --git a/sysdeps/i386/elf/configure.in b/sysdeps/i386/elf/configure.in
index 6352e69aa3..96e9b2c9f3 100644
--- a/sysdeps/i386/elf/configure.in
+++ b/sysdeps/i386/elf/configure.in
@@ -2,6 +2,7 @@ sinclude(./aclocal.m4)dnl Autoconf lossage
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/unix/sysv/linux.
 
+if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
 AC_CACHE_CHECK(for i386 TLS support, libc_cv_386_tls, [dnl
@@ -28,3 +29,4 @@ rm -f conftest*])
 if test $libc_cv_386_tls = yes; then
   AC_DEFINE(HAVE_TLS_SUPPORT)
 fi
+fi
-- 
cgit v1.2.3