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/s390/s390-64/elf | |
parent | 633f745dcad9c7324f56f8ef85ee9b460b1006e7 (diff) | |
download | glibc-83cd14204559abbb52635006832eaf4d2f42514a.tar.gz glibc-83cd14204559abbb52635006832eaf4d2f42514a.tar.xz glibc-83cd14204559abbb52635006832eaf4d2f42514a.zip |
Remove --wth-tls option, TLS support is required
Diffstat (limited to 'sysdeps/s390/s390-64/elf')
-rw-r--r-- | sysdeps/s390/s390-64/elf/configure | 107 | ||||
-rw-r--r-- | sysdeps/s390/s390-64/elf/configure.in | 6 |
2 files changed, 93 insertions, 20 deletions
diff --git a/sysdeps/s390/s390-64/elf/configure b/sysdeps/s390/s390-64/elf/configure index 3851674c7c..e81655e0d0 100644 --- a/sysdeps/s390/s390-64/elf/configure +++ b/sysdeps/s390/s390-64/elf/configure @@ -1,12 +1,93 @@ + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + # This file is generated from configure.in by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/s390/elf. -if test "$usetls" != no; then # Check for support of thread-local storage handling in assembler and # linker. -{ $as_echo "$as_me:$LINENO: checking for s390 TLS support" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for s390 TLS support" >&5 $as_echo_n "checking for s390 TLS support... " >&6; } -if test "${libc_cv_390_tls+set}" = set; then +if ${libc_cv_390_tls+:} false; then : $as_echo_n "(cached) " >&6 else cat > conftest.S <<\EOF @@ -25,28 +106,22 @@ foo: .long 25 brasl %r14,__tls_get_offset@plt:tls_ldcall:foo EOF if { ac_try='${CC-cc} -S $CFLAGS conftest.S 1>&5' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then libc_cv_390_tls=yes else libc_cv_390_tls=no fi rm -f conftest* fi -{ $as_echo "$as_me:$LINENO: result: $libc_cv_390_tls" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_390_tls" >&5 $as_echo "$libc_cv_390_tls" >&6; } -if test $libc_cv_390_tls = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_TLS_SUPPORT 1 -_ACEOF - -fi +if test $libc_cv_390_tls = no; then + as_fn_error $? "the assembler must support TLS" "$LINENO" 5 fi -cat >>confdefs.h <<\_ACEOF -#define PI_STATIC_AND_HIDDEN 1 -_ACEOF +$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h diff --git a/sysdeps/s390/s390-64/elf/configure.in b/sysdeps/s390/s390-64/elf/configure.in index ac953fcff3..007e3838a4 100644 --- a/sysdeps/s390/s390-64/elf/configure.in +++ b/sysdeps/s390/s390-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/s390/elf. -if test "$usetls" != no; then # Check for support of thread-local storage handling in assembler and # linker. AC_CACHE_CHECK(for s390 TLS support, libc_cv_390_tls, [dnl @@ -27,9 +26,8 @@ else libc_cv_390_tls=no fi rm -f conftest*]) -if test $libc_cv_390_tls = yes; then - AC_DEFINE(HAVE_TLS_SUPPORT) -fi +if test $libc_cv_390_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 |