diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-07 19:51:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-07 19:51:06 -0700 |
| commit | 9b849836f534bbd250a6733ebc1edf32e5f4d5dc (patch) | |
| tree | eb61bca9d2a94781588f322f7ae37345667bc43c /sysdeps/sparc/sparc64/multiarch | |
| parent | 5a31b2836d55bcc0c5b6f90f1e89245118e7f508 (diff) | |
| download | glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.gz glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.tar.bz2 glibc-9b849836f534bbd250a6733ebc1edf32e5f4d5dc.zip | |
sparc: Fix LD_BIND_NOW with multiarch.
Diffstat (limited to 'sysdeps/sparc/sparc64/multiarch')
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/memcpy.S | 22 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/memset.S | 36 |
2 files changed, 5 insertions, 53 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 diff --git a/sysdeps/sparc/sparc64/multiarch/memset.S b/sysdeps/sparc/sparc64/multiarch/memset.S index befd7edc82..2e27448742 100644 --- a/sysdeps/sparc/sparc64/multiarch/memset.S +++ b/sysdeps/sparc/sparc64/multiarch/memset.S @@ -32,24 +32,8 @@ ENTRY(memset) 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, 0x40, %g0 ! HWCAP_SPARC_BLKINIT + andcc %o0, 0x40, %g0 ! HWCAP_SPARC_BLKINIT be 9f nop # ifdef SHARED @@ -84,24 +68,8 @@ ENTRY(__bzero) 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, 0x40, %g0 ! HWCAP_SPARC_BLKINIT + andcc %o0, 0x40, %g0 ! HWCAP_SPARC_BLKINIT be 9f nop # ifdef SHARED |