2 files changed, 5 insertions, 10 deletions
diff --git a/sysdeps/i386/elf/configure b/sysdeps/i386/elf/configure
index 3aa5a7d1a3..83e89bd0a0 100644
--- a/sysdeps/i386/elf/configure
+++ b/sysdeps/i386/elf/configure
@@ -83,12 +83,11 @@ $as_echo X/"$0" |
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/i386/elf.
 
-if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386 TLS support" >&5
 $as_echo_n "checking for i386 TLS support... " >&6; }
-if test "${libc_cv_386_tls+set}" = set; then :
+if ${libc_cv_386_tls+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<\EOF
@@ -121,10 +120,8 @@ rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_386_tls" >&5
 $as_echo "$libc_cv_386_tls" >&6; }
-if test $libc_cv_386_tls = yes; then
-  $as_echo "#define HAVE_TLS_SUPPORT 1" >>confdefs.h
-
-fi
+if test $libc_cv_386_tls = no; then
+  as_fn_error $? "the assembler must support TLS" "$LINENO" 5
 fi
 
 $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
diff --git a/sysdeps/i386/elf/configure.in b/sysdeps/i386/elf/configure.in
index ca607adeb5..0c436f3f41 100644
--- a/sysdeps/i386/elf/configure.in
+++ b/sysdeps/i386/elf/configure.in
@@ -1,7 +1,6 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/i386/elf.
 
-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,9 +27,8 @@ else
   libc_cv_386_tls=no
 fi
 rm -f conftest*])
-if test $libc_cv_386_tls = yes; then
-  AC_DEFINE(HAVE_TLS_SUPPORT)
-fi
+if test $libc_cv_386_tls = no; then
+  AC_MSG_ERROR([the assembler must support TLS])
 fi
 
 dnl It is always possible to access static and hidden symbols in an