From 5c8cf8f50bb4598c4ecf2aa860aa7bf0ef0c3df7 Mon Sep 17 00:00:00 2001 From: joseph Date: Mon, 21 Mar 2011 17:49:12 +0000 Subject: Merge changes between r13053 and r13227 from /fsf/trunk. ports: * sysdeps/arm/eabi/bits/predefs.h: Correct license reference in last paragraph of license notice. git-svn-id: svn://svn.eglibc.org/trunk@13228 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/sysdeps/sparc/sparc64/elf/configure | 55 +++++++++++++++++- libc/sysdeps/sparc/sparc64/elf/configure.in | 89 ++++++++++++++--------------- 2 files changed, 95 insertions(+), 49 deletions(-) (limited to 'libc/sysdeps/sparc') diff --git a/libc/sysdeps/sparc/sparc64/elf/configure b/libc/sysdeps/sparc/sparc64/elf/configure index 7962ff52d..f213438aa 100644 --- a/libc/sysdeps/sparc/sparc64/elf/configure +++ b/libc/sysdeps/sparc/sparc64/elf/configure @@ -1,12 +1,61 @@ # This file is generated from configure.in by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/sparc/sparc64/elf. -cat >>confdefs.h <<\_ACEOF +if test "$usetls" != no; then +# Check for support of thread-local storage handling in assembler and linker. +{ $as_echo "$as_me:$LINENO: checking for sparc64 TLS support" >&5 +$as_echo_n "checking for sparc64 TLS support... " >&6; } +if test "${libc_cv_sparc64_tls+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat > conftest.s <<\EOF + .section ".tdata", "awT", @progbits + .globl foo +foo: .word 1 + .section ".tbss", "awT", @nobits + .globl bar +bar: .skip 4 + .text + .globl _start +_start: sethi %tgd_hi22(foo), %l1 + add %l1, %tgd_lo10(foo), %l1 + add %l7, %l1, %o0, %tgd_add(foo) + call __tls_get_addr, %tgd_call(foo) + sethi %tldm_hi22(bar), %l1 + add %l1, %tldm_lo10(bar), %l1 + add %l7, %l1, %o0, %tldm_add(bar) + call __tls_get_addr, %tldm_call(bar) + sethi %tldo_hix22(bar), %l1 + xor %l1, %tldo_lox10(bar), %l1 + add %o0, %l1, %l1, %tldo_add(bar) + sethi %tie_hi22(foo), %l1 + add %l1, %tie_lo10(foo), %l1 + ldx [%l7 + %l1], %l1, %tie_ldx(foo) + add %g7, %l1, %l1, %tie_add(foo) + sethi %tle_hix22(foo), %l1 + xor %l1, %tle_lox10(foo), %l1 +EOF +if { ac_try='${CC-cc} -o conftest.bin $CFLAGS $LDFLAGS conftest.s -nostdlib -nostartfiles 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_sparc64_tls=yes +else + libc_cv_sparc64_tls=no +fi +rm -f conftest* +fi +{ $as_echo "$as_me:$LINENO: result: $libc_cv_sparc64_tls" >&5 +$as_echo "$libc_cv_sparc64_tls" >&6; } +if test $libc_cv_sparc64_tls = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_TLS_SUPPORT 1 _ACEOF -libc_cv_sparc64_tls=yes - +fi +fi # Check for broken WDISP22 in the linker. { $as_echo "$as_me:$LINENO: checking for sparc64 ld WDISP22 handling" >&5 diff --git a/libc/sysdeps/sparc/sparc64/elf/configure.in b/libc/sysdeps/sparc/sparc64/elf/configure.in index f6281655a..4f7597835 100644 --- a/libc/sysdeps/sparc/sparc64/elf/configure.in +++ b/libc/sysdeps/sparc/sparc64/elf/configure.in @@ -1,52 +1,49 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/sparc/sparc64/elf. -AC_DEFINE(HAVE_TLS_SUPPORT) -libc_cv_sparc64_tls=yes - -dnl if test "$usetls" != no; then -dnl # Check for support of thread-local storage handling in assembler and linker. -dnl AC_CACHE_CHECK(for sparc64 TLS support, libc_cv_sparc64_tls, [dnl -dnl changequote(,)dnl -dnl cat > conftest.s <<\EOF -dnl .section ".tdata", "awT", @progbits -dnl .globl foo -dnl foo: .word 1 -dnl .section ".tbss", "awT", @nobits -dnl .globl bar -dnl bar: .skip 4 -dnl .text -dnl .globl main -dnl main: sethi %tgd_hi22(foo), %l1 -dnl add %l1, %tgd_lo10(foo), %l1 -dnl add %l7, %l1, %o0, %tgd_add(foo) -dnl call __tls_get_addr, %tgd_call(foo) -dnl sethi %tldm_hi22(bar), %l1 -dnl add %l1, %tldm_lo10(bar), %l1 -dnl add %l7, %l1, %o0, %tldm_add(bar) -dnl call __tls_get_addr, %tldm_call(bar) -dnl sethi %tldo_hix22(bar), %l1 -dnl xor %l1, %tldo_lox10(bar), %l1 -dnl add %o0, %l1, %l1, %tldo_add(bar) -dnl sethi %tie_hi22(foo), %l1 -dnl add %l1, %tie_lo10(foo), %l1 -dnl ldx [%l7 + %l1], %l1, %tie_ldx(foo) -dnl add %g7, %l1, %l1, %tie_add(foo) -dnl sethi %tle_hix22(foo), %l1 -dnl xor %l1, %tle_lox10(foo), %l1 -dnl EOF -dnl changequote([,])dnl -dnl dnl -dnl if AC_TRY_COMMAND(${CC-cc} -o conftest.bin $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then -dnl libc_cv_sparc64_tls=yes -dnl else -dnl libc_cv_sparc64_tls=no -dnl fi -dnl rm -f conftest*]) -dnl if test $libc_cv_sparc64_tls = yes; then -dnl AC_DEFINE(HAVE_TLS_SUPPORT) -dnl fi -dnl fi +if test "$usetls" != no; then +# Check for support of thread-local storage handling in assembler and linker. +AC_CACHE_CHECK(for sparc64 TLS support, libc_cv_sparc64_tls, [dnl +changequote(,)dnl +cat > conftest.s <<\EOF + .section ".tdata", "awT", @progbits + .globl foo +foo: .word 1 + .section ".tbss", "awT", @nobits + .globl bar +bar: .skip 4 + .text + .globl _start +_start: sethi %tgd_hi22(foo), %l1 + add %l1, %tgd_lo10(foo), %l1 + add %l7, %l1, %o0, %tgd_add(foo) + call __tls_get_addr, %tgd_call(foo) + sethi %tldm_hi22(bar), %l1 + add %l1, %tldm_lo10(bar), %l1 + add %l7, %l1, %o0, %tldm_add(bar) + call __tls_get_addr, %tldm_call(bar) + sethi %tldo_hix22(bar), %l1 + xor %l1, %tldo_lox10(bar), %l1 + add %o0, %l1, %l1, %tldo_add(bar) + sethi %tie_hi22(foo), %l1 + add %l1, %tie_lo10(foo), %l1 + ldx [%l7 + %l1], %l1, %tie_ldx(foo) + add %g7, %l1, %l1, %tie_add(foo) + sethi %tle_hix22(foo), %l1 + xor %l1, %tle_lox10(foo), %l1 +EOF +changequote([,])dnl +dnl +if AC_TRY_COMMAND(${CC-cc} -o conftest.bin $CFLAGS $LDFLAGS conftest.s -nostdlib -nostartfiles 1>&AS_MESSAGE_LOG_FD); then + libc_cv_sparc64_tls=yes +else + libc_cv_sparc64_tls=no +fi +rm -f conftest*]) +if test $libc_cv_sparc64_tls = yes; then + AC_DEFINE(HAVE_TLS_SUPPORT) +fi +fi # Check for broken WDISP22 in the linker. AC_CACHE_CHECK(for sparc64 ld WDISP22 handling, libc_cv_sparc64_wdisp22, [dnl -- cgit v1.2.3