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/crti.S | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sysdeps/sparc/crti.S') diff --git a/sysdeps/sparc/crti.S b/sysdeps/sparc/crti.S index caed362..7aa5453 100644 --- a/sysdeps/sparc/crti.S +++ b/sysdeps/sparc/crti.S @@ -71,15 +71,9 @@ _init: save %sp, -STACKFRAME_SIZE, %sp #if PREINIT_FUNCTION_WEAK SETUP_PIC_REG(l7) -#ifdef HAVE_BINUTILS_GOTDATA sethi %gdop_hix22(PREINIT_FUNCTION), %g1 xor %g1, %gdop_lox10(PREINIT_FUNCTION), %g1 GOT_LOAD [%l7 + %g1], %g1, %gdop(PREINIT_FUNCTION) -#else - sethi %hi(PREINIT_FUNCTION), %g1 - or %g1, %lo(PREINIT_FUNCTION), %g1 - GOT_LOAD [%l7 + %g1], %g1 -#endif cmp %g1, 0 be 1f nop -- cgit v1.1