From 7a8b71c37c39264fc41ed69fe85911c7d0c03611 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 21 Feb 2012 11:32:08 -0800 Subject: [PATCH] Remove sparc WDISP22 configure checks, no longer used. * sysdeps/sparc/sparc32/elf/configure.in: Delete WDISP22 check. * sysdeps/sparc/sparc32/elf/configure: Regenerate. * sysdeps/sparc/sparc64/elf/configure.in: Likewise. * sysdeps/sparc/sparc64/elf/configure: Regenerate. * config.h.in (BROKEN_SPARC_WDISP22): Remove. --- ChangeLog | 8 ++++++++ config.h.in | 4 ---- sysdeps/sparc/sparc32/elf/configure | 30 ------------------------------ sysdeps/sparc/sparc32/elf/configure.in | 17 ----------------- sysdeps/sparc/sparc64/elf/configure | 30 ------------------------------ sysdeps/sparc/sparc64/elf/configure.in | 17 ----------------- 6 files changed, 8 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index 366d891..61894f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-20 David S. Miller + + * sysdeps/sparc/sparc32/elf/configure.in: Delete WDISP22 check. + * sysdeps/sparc/sparc32/elf/configure: Regenerate. + * sysdeps/sparc/sparc64/elf/configure.in: Likewise. + * sysdeps/sparc/sparc64/elf/configure: Regenerate. + * config.h.in (BROKEN_SPARC_WDISP22): Remove. + 2012-02-21 Joseph Myers * manual/install.texi: Do not mention specific glibc version diff --git a/config.h.in b/config.h.in index 632f89f..53c6823 100644 --- a/config.h.in +++ b/config.h.in @@ -87,10 +87,6 @@ certain registers (CR0, MQ, CTR, LR) in asm statements. */ #undef BROKEN_PPC_ASM_CR0 -/* Defined on SPARC if ld does not handle R_SPARC_WDISP22 against .hidden - symbol. sysdeps/sparc/sparc32/elf/configure. */ -#undef BROKEN_SPARC_WDISP22 - /* Define if the linker supports the -z combreloc option. */ #undef HAVE_Z_COMBRELOC diff --git a/sysdeps/sparc/sparc32/elf/configure b/sysdeps/sparc/sparc32/elf/configure index e684b2d..c6372c4 100644 --- a/sysdeps/sparc/sparc32/elf/configure +++ b/sysdeps/sparc/sparc32/elf/configure @@ -132,33 +132,3 @@ $as_echo "$libc_cv_sparc32_tls" >&6; } if test $libc_cv_sparc32_tls = no; then as_fn_error $? "the assembler must support TLS" "$LINENO" 5 fi - -# Check for broken WDISP22 in the linker. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc32 ld WDISP22 handling" >&5 -$as_echo_n "checking for sparc32 ld WDISP22 handling... " >&6; } -if ${libc_cv_sparc32_wdisp22+:} false; then : - $as_echo_n "(cached) " >&6 -else - echo 'bne foo; nop' > conftest1.s -echo '.globl foo; .hidden foo; foo: nop' > conftest2.s -libc_cv_sparc32_wdisp22=unknown -if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conftest.so 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then - libc_cv_sparc32_wdisp22=broken - else - libc_cv_sparc32_wdisp22=ok - fi -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc32_wdisp22" >&5 -$as_echo "$libc_cv_sparc32_wdisp22" >&6; } -if test $libc_cv_sparc32_wdisp22 != ok; then - $as_echo "#define BROKEN_SPARC_WDISP22 1" >>confdefs.h - -fi diff --git a/sysdeps/sparc/sparc32/elf/configure.in b/sysdeps/sparc/sparc32/elf/configure.in index d1593a6..152d4e5 100644 --- a/sysdeps/sparc/sparc32/elf/configure.in +++ b/sysdeps/sparc/sparc32/elf/configure.in @@ -41,20 +41,3 @@ rm -f conftest*]) if test $libc_cv_sparc32_tls = no; then AC_MSG_ERROR([the assembler must support TLS]) fi - -# Check for broken WDISP22 in the linker. -AC_CACHE_CHECK(for sparc32 ld WDISP22 handling, libc_cv_sparc32_wdisp22, [dnl -echo 'bne foo; nop' > conftest1.s -echo '.globl foo; .hidden foo; foo: nop' > conftest2.s -libc_cv_sparc32_wdisp22=unknown -if AC_TRY_COMMAND(${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conftest.so 1>&AS_MESSAGE_LOG_FD); then - if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then - libc_cv_sparc32_wdisp22=broken - else - libc_cv_sparc32_wdisp22=ok - fi -fi -rm -f conftest*]) -if test $libc_cv_sparc32_wdisp22 != ok; then - AC_DEFINE(BROKEN_SPARC_WDISP22) -fi diff --git a/sysdeps/sparc/sparc64/elf/configure b/sysdeps/sparc/sparc64/elf/configure index 354afae..04a2d1f 100644 --- a/sysdeps/sparc/sparc64/elf/configure +++ b/sysdeps/sparc/sparc64/elf/configure @@ -133,33 +133,3 @@ $as_echo "$libc_cv_sparc64_tls" >&6; } if test $libc_cv_sparc64_tls = no; then as_fn_error $? "the assembler must support TLS" "$LINENO" 5 fi - -# Check for broken WDISP22 in the linker. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc64 ld WDISP22 handling" >&5 -$as_echo_n "checking for sparc64 ld WDISP22 handling... " >&6; } -if ${libc_cv_sparc64_wdisp22+:} false; then : - $as_echo_n "(cached) " >&6 -else - echo 'bne foo; nop' > conftest1.s -echo '.globl foo; .hidden foo; foo: nop' > conftest2.s -libc_cv_sparc64_wdisp22=unknown -if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conftest.so 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then - libc_cv_sparc64_wdisp22=broken - else - libc_cv_sparc64_wdisp22=ok - fi -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc64_wdisp22" >&5 -$as_echo "$libc_cv_sparc64_wdisp22" >&6; } -if test $libc_cv_sparc64_wdisp22 != ok; then - $as_echo "#define BROKEN_SPARC_WDISP22 1" >>confdefs.h - -fi diff --git a/sysdeps/sparc/sparc64/elf/configure.in b/sysdeps/sparc/sparc64/elf/configure.in index b56b275..959c628 100644 --- a/sysdeps/sparc/sparc64/elf/configure.in +++ b/sysdeps/sparc/sparc64/elf/configure.in @@ -42,20 +42,3 @@ rm -f conftest*]) if test $libc_cv_sparc64_tls = no; then AC_MSG_ERROR([the assembler must support TLS]) fi - -# Check for broken WDISP22 in the linker. -AC_CACHE_CHECK(for sparc64 ld WDISP22 handling, libc_cv_sparc64_wdisp22, [dnl -echo 'bne foo; nop' > conftest1.s -echo '.globl foo; .hidden foo; foo: nop' > conftest2.s -libc_cv_sparc64_wdisp22=unknown -if AC_TRY_COMMAND(${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conftest.so 1>&AS_MESSAGE_LOG_FD); then - if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then - libc_cv_sparc64_wdisp22=broken - else - libc_cv_sparc64_wdisp22=ok - fi -fi -rm -f conftest*]) -if test $libc_cv_sparc64_wdisp22 != ok; then - AC_DEFINE(BROKEN_SPARC_WDISP22) -fi -- 2.7.4