diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-01 15:04:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 15:04:16 -0800 |
| commit | 53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7 (patch) | |
| tree | fb6afbdc3700054fbeef2f4e5b8dc42bc4a6f583 /sysdeps/sparc/sparc64 | |
| parent | bec039bcefe6a0494a249e2b78e112a0ab60893b (diff) | |
| download | glibc-53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7.tar glibc-53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7.tar.gz glibc-53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7.tar.bz2 glibc-53362a4b0f8cb9bab0c23553b199e4a11ec7d4d7.zip | |
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.
Diffstat (limited to 'sysdeps/sparc/sparc64')
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 7 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/elf/start.S | 12 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/fpu/w_sqrt.S | 6 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/fpu/w_sqrtf.S | 6 |
4 files changed, 0 insertions, 31 deletions
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 6bab5ce310..87655d28ad 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -264,17 +264,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ -#ifdef HAVE_BINUTILS_GOTDATA #define RTLD_GOT_ADDRESS(pic_reg, reg, symbol) \ "sethi %gdop_hix22(" #symbol "), " #reg "\n\t" \ "xor " #reg ", %gdop_lox10(" #symbol "), " #reg "\n\t" \ "ldx [" #pic_reg " + " #reg "], " #reg ", %gdop(" #symbol ")\n" -#else -#define RTLD_GOT_ADDRESS(pic_reg, reg, symbol) \ - "sethi %hi(" #symbol "), " #reg "\n\t" \ - "or " #reg ", %lo(" #symbol "), " #reg "\n\t" \ - "ldx [" #pic_reg " + " #reg "], " #reg "\n" -#endif #define __S1(x) #x #define __S(x) __S1(x) diff --git a/sysdeps/sparc/sparc64/elf/start.S b/sysdeps/sparc/sparc64/elf/start.S index 50f2df2c7e..7924fb4828 100644 --- a/sysdeps/sparc/sparc64/elf/start.S +++ b/sysdeps/sparc/sparc64/elf/start.S @@ -67,7 +67,6 @@ _start: or %o3, %lo(__libc_csu_init), %o3 or %o4, %lo(__libc_csu_fini), %o4 #else -#ifdef HAVE_BINUTILS_GOTDATA sethi %gdop_hix22(main), %o0 sethi %gdop_hix22(__libc_csu_init), %o3 sethi %gdop_hix22(__libc_csu_fini), %o4 @@ -77,17 +76,6 @@ _start: ldx [%l7 + %o0], %o0, %gdop(main) ldx [%l7 + %o3], %o3, %gdop(__libc_csu_init) ldx [%l7 + %o4], %o4, %gdop(__libc_csu_fini) -#else - sethi %hi(main), %o0 - sethi %hi(__libc_csu_init), %o3 - sethi %hi(__libc_csu_fini), %o4 - or %o0, %lo(main), %o0 - or %o3, %lo(__libc_csu_init), %o3 - or %o4, %lo(__libc_csu_fini), %o4 - ldx [%l7 + %o0], %o0 - ldx [%l7 + %o3], %o3 - ldx [%l7 + %o4], %o4 -#endif #endif /* When starting a binary via the dynamic linker, %g1 contains the diff --git a/sysdeps/sparc/sparc64/fpu/w_sqrt.S b/sysdeps/sparc/sparc64/fpu/w_sqrt.S index 11241a34b1..dd6039aa75 100644 --- a/sysdeps/sparc/sparc64/fpu/w_sqrt.S +++ b/sysdeps/sparc/sparc64/fpu/w_sqrt.S @@ -28,18 +28,12 @@ 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 ldx [%o5 + %g1], %g1, %gdop(_LIB_VERSION) #else sethi %hi(_LIB_VERSION), %g1 or %g1, %lo(_LIB_VERSION), %g1 - ldx [%o5 + %g1], %g1 -#endif -#else - sethi %hi(_LIB_VERSION), %g1 - or %g1, %lo(_LIB_VERSION), %g1 #endif ld [%g1], %g1 cmp %g1, -1 diff --git a/sysdeps/sparc/sparc64/fpu/w_sqrtf.S b/sysdeps/sparc/sparc64/fpu/w_sqrtf.S index 9a5d556f36..1472e34552 100644 --- a/sysdeps/sparc/sparc64/fpu/w_sqrtf.S +++ b/sysdeps/sparc/sparc64/fpu/w_sqrtf.S @@ -28,18 +28,12 @@ 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 ldx [%o5 + %g1], %g1, %gdop(_LIB_VERSION) #else sethi %hi(_LIB_VERSION), %g1 or %g1, %lo(_LIB_VERSION), %g1 - ldx [%o5 + %g1], %g1 -#endif -#else - sethi %hi(_LIB_VERSION), %g1 - or %g1, %lo(_LIB_VERSION), %g1 #endif ld [%g1], %g1 cmp %g1, -1 |