From 53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 1 Mar 2012 15:04:16 -0800 Subject: Remove sparc binutils GOTDATA checks in lieu of new minimum version requirement. * sysdeps/sparc/crti.S: Remove HAVE_BINUTILS_GOTDATA checks. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/elf/start.S: Likewise. * sysdeps/sparc/sparc32/fpu/w_sqrt.S: Likewise. * sysdeps/sparc/sparc32/fpu/w_sqrtf.S: Likewise. * sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S: Likewise. * sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/elf/start.S: Likewise. * sysdeps/sparc/sparc64/fpu/w_sqrt.S: Likewise. * sysdeps/sparc/sparc64/fpu/w_sqrtf.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/____longjmp_chk.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. * config.h.in (HAVE_BINUTILS_GOTDATA): Delete. * sysdeps/sparc/elf/configure.in: Remove binutils GOTDATA checks. * sysdeps/sparc/elf/configure: Regenerated. --- sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S | 6 ------ sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S | 6 ------ 2 files changed, 12 deletions(-) (limited to 'sysdeps/sparc/sparc32/sparcv9/fpu') diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S index c084aa8335..ce7491e438 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrt.S @@ -30,15 +30,9 @@ ENTRY (__sqrt) 1: #ifdef SHARED SETUP_PIC_REG_LEAF(o5, g1) -#ifdef HAVE_BINUTILS_GOTDATA sethi %gdop_hix22(_LIB_VERSION), %g1 xor %g1, %gdop_lox10(_LIB_VERSION), %g1 ld [%o5 + %g1], %g1, %gdop(_LIB_VERSION) -#else - sethi %hi(_LIB_VERSION), %g1 - or %g1, %lo(_LIB_VERSION), %g1 - ld [%o5 + %g1], %g1 -#endif #else sethi %hi(_LIB_VERSION), %g1 or %g1, %lo(_LIB_VERSION), %g1 diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S index 3de7f396c2..0e00b66964 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/w_sqrtf.S @@ -30,15 +30,9 @@ ENTRY (__sqrtf) 1: #ifdef SHARED SETUP_PIC_REG_LEAF(o5, g1) -#ifdef HAVE_BINUTILS_GOTDATA sethi %gdop_hix22(_LIB_VERSION), %g1 xor %g1, %gdop_lox10(_LIB_VERSION), %g1 ld [%o5 + %g1], %g1, %gdop(_LIB_VERSION) -#else - sethi %hi(_LIB_VERSION), %g1 - or %g1, %lo(_LIB_VERSION), %g1 - ld [%o5 + %g1], %g1 -#endif #else sethi %hi(_LIB_VERSION), %g1 or %g1, %lo(_LIB_VERSION), %g1 -- cgit 1.4.1