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.

5 files changed, 4 insertions, 72 deletions

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S b/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
index 7246e893a7..0b3361b0f0 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
@@ -67,15 +67,9 @@ ENTRY (____longjmp_chk)
 	or	%o0, %lo(longjmp_msg), %o0
 #else
 	SETUP_PIC_REG(l7)
-#ifdef HAVE_BINUTILS_GOTDATA
 	sethi	%gdop_hix22(longjmp_msg), %o0
 	xor	%o0, %gdop_lox10(longjmp_msg), %o0
 	ld	[%l7 + %o0], %o0, %gdop(longjmp_msg)
-#else
-	sethi	%hi(longjmp_msg), %o0
-	or	%o0, %lo(longjmp_msg), %o0
-	ld	[%l7 + %o0], %o0
-#endif
 #endif
 	call	HIDDEN_JUMPTARGET(__fortify_fail)
 	 nop
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 3d6042e9ec..3424598566 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -88,8 +88,7 @@ ENTRY(name);					\
 	 mov	%g1, %o7;
 #else
 # if RTLD_PRIVATE_ERRNO
-#  ifdef HAVE_BINUTILS_GOTDATA
-#   define SYSCALL_ERROR_HANDLER		\
+#  define SYSCALL_ERROR_HANDLER			\
 0:	SETUP_PIC_REG_LEAF(o2,g1)		\
 	sethi	%gdop_hix22(rtld_errno), %g1;	\
 	xor	%g1, %gdop_lox10(rtld_errno), %g1;\
@@ -97,16 +96,6 @@ ENTRY(name);					\
 	st	%o0, [%g1];			\
 	jmp	%o7 + 8;			\
 	 mov	-1, %o0;
-#  else
-#   define SYSCALL_ERROR_HANDLER		\
-0:	SETUP_PIC_REG_LEAF(o2,g1)		\
-	sethi	%hi(rtld_errno), %g1;		\
-	or	%g1, %lo(rtld_errno), %g1;	\
-	ld	[%o2 + %g1], %g1;		\
-	st	%o0, [%g1];			\
-	jmp	%o7 + 8;			\
-	 mov	-1, %o0;
-#  endif
 # elif defined _LIBC_REENTRANT
 
 #  ifndef NOT_IN_libc
@@ -123,8 +112,7 @@ ENTRY(name);					\
 	jmp	%o7 + 8;					\
 	 mov	-1, %o0;
 # else
-#  ifdef HAVE_BINUTILS_GOTDATA
-#   define SYSCALL_ERROR_HANDLER	\
+#  define SYSCALL_ERROR_HANDLER		\
 0:	SETUP_PIC_REG_LEAF(o2,g1)	\
 	sethi	%gdop_hix22(errno), %g1;\
 	xor	%g1, %gdop_lox10(errno), %g1;\
@@ -132,16 +120,6 @@ ENTRY(name);					\
 	st	%o0, [%g1];		\
 	jmp	%o7 + 8;		\
 	 mov	-1, %o0;
-#  else
-#   define SYSCALL_ERROR_HANDLER	\
-0:	SETUP_PIC_REG_LEAF(o2,g1)	\
-	sethi	%hi(errno), %g1;	\
-	or	%g1, %lo(errno), %g1;	\
-	ld	[%o2 + %g1], %g1;	\
-	st	%o0, [%g1];		\
-	jmp	%o7 + 8;		\
-	 mov	-1, %o0;
-#  endif
 # endif	/* _LIBC_REENTRANT */
 #endif	/* PIC */
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/____longjmp_chk.S
index 69cf5acb38..9b4e1e74f8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/____longjmp_chk.S
@@ -67,15 +67,9 @@ ENTRY (____longjmp_chk)
 	or	%o0, %lo(longjmp_msg), %o0
 #else
 	SETUP_PIC_REG(l7)
-#ifdef HAVE_BINUTILS_GOTDATA
 	sethi	%gdop_hix22(longjmp_msg), %o0
 	xor	%o0, %gdop_lox10(longjmp_msg), %o0
 	ldx	[%l7 + %o0], %o0, %gdop(longjmp_msg)
-#else
-	sethi	%hi(longjmp_msg), %o0
-	or	%o0, %lo(longjmp_msg), %o0
-	ldx	[%l7 + %o0], %o0
-#endif
 #endif
 	call	HIDDEN_JUMPTARGET(__fortify_fail)
 	 nop
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
index a89d8775e1..14b2967acb 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
@@ -64,15 +64,9 @@ ENTRY (__brk)
 	sethi	%hi(__curbrk), %g1
 	or	%g1, %lo(__curbrk), %g1
 #else
-#ifdef HAVE_BINUTILS_GOTDATA
 	sethi	%gdop_hix22(__curbrk), %g1
 	xor	%g1, %gdop_lox10(__curbrk), %g1
 	ldx	[%l7 + %g1], %g1, %gdop(__curbrk)
-#else
-	sethi	%hi(__curbrk), %g1
-	or	%g1, %lo(__curbrk), %g1
-	ldx	[%l7 + %g1], %g1
-#endif
 #endif
 	stx	%o0, [%g1]
 	mov	%g0, %i0
@@ -89,15 +83,9 @@ ENTRY (__brk)
 	sethi	%hi(errno), %g1
 	or	%g1, %lo(errno), %g1
 #else
-#ifdef HAVE_BINUTILS_GOTDATA
 	sethi	%gdop_hix22(errno), %g1
 	xor	%g1, %gdop_lox10(errno), %g1
 	ldx	[%l7 + %g1], %g1, %gdop(errno)
-#else
-	sethi	%hi(errno), %g1
-	or	%g1, %lo(errno), %g1
-	ldx	[%l7 + %g1], %g1
-#endif
 #endif
 	st	%o0, [%g1]
 #else
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index 33e1a41165..1bf75973fc 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -95,8 +95,7 @@ ENTRY(name);					\
 	 mov	%g1, %o7;
 #else
 # if RTLD_PRIVATE_ERRNO
-#  ifdef HAVE_BINUTILS_GOTDATA
-#   define SYSCALL_ERROR_HANDLER		\
+#  define SYSCALL_ERROR_HANDLER			\
 0:	SETUP_PIC_REG_LEAF(o2,g1)		\
 	sethi	%gdop_hix22(rtld_errno), %g1;	\
 	xor	%g1, %gdop_lox10(rtld_errno), %g1;\
@@ -104,16 +103,6 @@ ENTRY(name);					\
 	st	%o0, [%g1];			\
 	jmp	%o7 + 8;			\
 	 mov	-1, %o0;
-#  else
-#   define SYSCALL_ERROR_HANDLER		\
-0:	SETUP_PIC_REG_LEAF(o2,g1)		\
-	sethi	%hi(rtld_errno), %g1;		\
-	or	%g1, %lo(rtld_errno), %g1;	\
-	ldx	[%o2 + %g1], %g1;		\
-	st	%o0, [%g1];			\
-	jmp	%o7 + 8;			\
-	 mov	-1, %o0;
-#  endif
 # elif defined _LIBC_REENTRANT
 
 #  ifndef NOT_IN_libc
@@ -130,8 +119,7 @@ ENTRY(name);					\
 	jmp	%o7 + 8;					\
 	 mov	-1, %o0;
 # else
-#  ifdef HAVE_BINUTILS_GOTDATA
-#   define SYSCALL_ERROR_HANDLER	\
+#  define SYSCALL_ERROR_HANDLER		\
 0:	SETUP_PIC_REG_LEAF(o2,g1)	\
 	sethi	%gdop_hix22(errno), %g1;\
 	xor	%g1, %gdop_lox10(errno), %g1;\
@@ -139,16 +127,6 @@ ENTRY(name);					\
 	st	%o0, [%g1];		\
 	jmp	%o7 + 8;		\
 	 mov	-1, %o0;
-#  else
-#   define SYSCALL_ERROR_HANDLER	\
-0:	SETUP_PIC_REG_LEAF(o2,g1)	\
-	sethi	%hi(errno), %g1;	\
-	or	%g1, %lo(errno), %g1;	\
-	ldx	[%o2 + %g1], %g1;	\
-	st	%o0, [%g1];		\
-	jmp	%o7 + 8;		\
-	 mov	-1, %o0;
-#  endif
 # endif	/* _LIBC_REENTRANT */
 #endif	/* PIC */