From c0102611b1f1bd1ce2a2952e9b74ff33fa02717e Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Sat, 3 Mar 2012 18:18:04 +0000
Subject: Merge changes between r17194 and r17384 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17385 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/config.h.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libc/config.h.in')

diff --git a/libc/config.h.in b/libc/config.h.in
index 9d4bd0a5b..5fdd0410f 100644
--- a/libc/config.h.in
+++ b/libc/config.h.in
@@ -87,9 +87,8 @@
    certain registers (CR0, MQ, CTR, LR) in asm statements.  */
 #undef	BROKEN_PPC_ASM_CR0
 
-/* Defined on SPARC if ld does not handle R_SPARC_WDISP22 against .hidden
-   symbol.  sysdeps/sparc/sparc32/elf/configure.  */
-#undef	BROKEN_SPARC_WDISP22
+/* Defined on SPARC if GCC emits GOTDATA relocations.  */
+#undef  HAVE_GCC_GOTDATA
 
 /* Define if the linker supports the -z combreloc option.  */
 #undef	HAVE_Z_COMBRELOC
-- 
cgit v1.2.3