about summary refs log tree commit diff
path: root/sysdeps/sparc/sparc64/multiarch/memcpy.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-07 19:51:06 -0700
committerDavid S. Miller <davem@davemloft.net>2011-06-07 19:51:06 -0700
commit9b849836f534bbd250a6733ebc1edf32e5f4d5dc (patch)
treeeb61bca9d2a94781588f322f7ae37345667bc43c /sysdeps/sparc/sparc64/multiarch/memcpy.S
parent5a31b2836d55bcc0c5b6f90f1e89245118e7f508 (diff)
downloadglibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.gz
glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.xz
glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.zip
sparc: Fix LD_BIND_NOW with multiarch.
Diffstat (limited to 'sysdeps/sparc/sparc64/multiarch/memcpy.S')
-rw-r--r--sysdeps/sparc/sparc64/multiarch/memcpy.S22
1 files changed, 3 insertions, 19 deletions
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy.S b/sysdeps/sparc/sparc64/multiarch/memcpy.S
index a708de10e2..c12dc3bbed 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy.S
@@ -32,26 +32,10 @@ ENTRY(memcpy)
 	 or	%o3, %lo(_GLOBAL_OFFSET_TABLE_+4), %o3
 1:	add	%o7, %o3, %o3
 	mov	%o5, %o7
-	sethi	%hi(_rtld_global_ro), %o2
-	or	%o2, %lo(_rtld_global_ro), %o2
-#  ifdef __arch64__
-	ldx	[%o3 + %o2], %o2
-	ldx	[%o2 + RTLD_GLOBAL_RO_DL_HWCAP_OFFSET], %o2
-#  else
-	ld	[%o3 + %o2], %o2
-	ld	[%o2 + RTLD_GLOBAL_RO_DL_HWCAP_OFFSET + 4], %o2
-#  endif
-# else
-	set	_dl_hwcap, %o3
-#  ifdef __arch64__
-	ldx	[%o3], %o2
-#  else
-	ld	[%o3 + 4], %o2
-#  endif
 # endif
-	andcc	%o2, 0x80, %g0	! HWCAP_SPARC_N2
+	andcc	%o0, 0x80, %g0	! HWCAP_SPARC_N2
 	be	1f
-	 andcc	%o2, 0x40, %g0	! HWCAP_SPARC_BLKINIT
+	 andcc	%o0, 0x40, %g0	! HWCAP_SPARC_BLKINIT
 # ifdef SHARED
 	sethi	%gdop_hix22(__memcpy_niagara2), %o1
 	xor	%o1, %gdop_lox10(__memcpy_niagara2), %o1
@@ -61,7 +45,7 @@ ENTRY(memcpy)
 	ba	10f
 	 nop
 1:	be	1f
-	 andcc	%o2, 0x20, %g0	! HWCAP_SPARC_ULTRA3
+	 andcc	%o0, 0x20, %g0	! HWCAP_SPARC_ULTRA3
 # ifdef SHARED
 	sethi	%gdop_hix22(__memcpy_niagara1), %o1
 	xor	%o1, %gdop_lox10(__memcpy_niagara1), %o1