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.

6 files changed, 0 insertions, 43 deletions

diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index 7ea97fbffd..1620ca54df 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -216,17 +216,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" \
 	"ld	[" #pic_reg " + " #reg "], " #reg ", %gdop(" #symbol ")"
-#else
-#define RTLD_GOT_ADDRESS(pic_reg, reg, symbol)	\
-	"sethi	%hi(" #symbol "), " #reg "\n\t" \
-	"or	" #reg ", %lo(" #symbol "), " #reg "\n\t" \
-	"ld	[" #pic_reg " + " #reg "], " #reg
-#endif
 
 #define RTLD_START __asm__ ("\
 	.text\n\
diff --git a/sysdeps/sparc/sparc32/elf/start.S b/sysdeps/sparc/sparc32/elf/start.S
index 0426714c5e..1efa8e8393 100644
--- a/sysdeps/sparc/sparc32/elf/start.S
+++ b/sysdeps/sparc/sparc32/elf/start.S
@@ -66,7 +66,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
@@ -76,17 +75,6 @@ _start:
 	ld	[%l7 + %o0], %o0, %gdop(main)
 	ld	[%l7 + %o3], %o3, %gdop(__libc_csu_init)
 	ld	[%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
-	ld	[%l7 + %o0], %o0
-	ld	[%l7 + %o3], %o3
-	ld	[%l7 + %o4], %o4
-#endif
 #endif
 
   /* When starting a binary via the dynamic linker, %g1 contains the
diff --git a/sysdeps/sparc/sparc32/fpu/w_sqrt.S b/sysdeps/sparc/sparc32/fpu/w_sqrt.S
index e02fadf130..667c71c625 100644
--- a/sysdeps/sparc/sparc32/fpu/w_sqrt.S
+++ b/sysdeps/sparc/sparc32/fpu/w_sqrt.S
@@ -32,18 +32,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
 	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
 #endif
 	ld	[%g1], %g1
 	cmp	%g1, -1
diff --git a/sysdeps/sparc/sparc32/fpu/w_sqrtf.S b/sysdeps/sparc/sparc32/fpu/w_sqrtf.S
index cf4c800624..5260bec373 100644
--- a/sysdeps/sparc/sparc32/fpu/w_sqrtf.S
+++ b/sysdeps/sparc/sparc32/fpu/w_sqrtf.S
@@ -31,18 +31,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
 	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
 #endif
 	ld	[%g1], %g1
 	cmp	%g1, -1
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,18 +30,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
 	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
 #endif
 	ld	[%g1], %g1
 	cmp	%g1, -1
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,18 +30,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
 	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
 #endif
 	ld	[%g1], %g1
 	cmp	%g1, -1