diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 15:02:01 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-11 15:02:01 -0400 |
| commit | 83cd14204559abbb52635006832eaf4d2f42514a (patch) | |
| tree | 81dbbd663d1011d9fc01b591fd2bea237905ab6b /sysdeps/x86_64 | |
| parent | 633f745dcad9c7324f56f8ef85ee9b460b1006e7 (diff) | |
| download | glibc-83cd14204559abbb52635006832eaf4d2f42514a.tar glibc-83cd14204559abbb52635006832eaf4d2f42514a.tar.gz glibc-83cd14204559abbb52635006832eaf4d2f42514a.tar.bz2 glibc-83cd14204559abbb52635006832eaf4d2f42514a.zip | |
Remove --wth-tls option, TLS support is required
Diffstat (limited to 'sysdeps/x86_64')
| -rw-r--r-- | sysdeps/x86_64/elf/configure | 7 | ||||
| -rw-r--r-- | sysdeps/x86_64/elf/configure.in | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sysdeps/x86_64/elf/configure b/sysdeps/x86_64/elf/configure index c3c8f561fe..7f2b313bc4 100644 --- a/sysdeps/x86_64/elf/configure +++ b/sysdeps/x86_64/elf/configure @@ -83,7 +83,6 @@ $as_echo X/"$0" | # This file is generated from configure.in by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/x86_64/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 x86-64 TLS support" >&5 $as_echo_n "checking for x86-64 TLS support... " >&6; } @@ -117,10 +116,8 @@ rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_x86_64_tls" >&5 $as_echo "$libc_cv_x86_64_tls" >&6; } -if test $libc_cv_x86_64_tls = yes; then - $as_echo "#define HAVE_TLS_SUPPORT 1" >>confdefs.h - -fi +if test $libc_cv_x86_64_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/x86_64/elf/configure.in b/sysdeps/x86_64/elf/configure.in index 4a41290f11..c53328b4c9 100644 --- a/sysdeps/x86_64/elf/configure.in +++ b/sysdeps/x86_64/elf/configure.in @@ -1,7 +1,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/x86_64/elf. -if test "$usetls" != no; then # Check for support of thread-local storage handling in assembler and linker. AC_CACHE_CHECK(for x86-64 TLS support, libc_cv_x86_64_tls, [dnl cat > conftest.s <<\EOF @@ -24,9 +23,8 @@ else libc_cv_x86_64_tls=no fi rm -f conftest*]) -if test $libc_cv_x86_64_tls = yes; then - AC_DEFINE(HAVE_TLS_SUPPORT) -fi +if test $libc_cv_x86_64_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 |