PowerPC32: Check _rtld_global_ro access value

diff --git a/sysdeps/powerpc/powerpc32/multiarch/memcpy.S b/sysdeps/powerpc/powerpc32/multiarch/memcpy.S
index 7547520299a63036e09a05d82a03c4a01e3bffca..794d2fbb81df228825358bb31c84578fb5882e34 100644 (file)
--- a/sysdeps/powerpc/powerpc32/multiarch/memcpy.S
+++ b/sysdeps/powerpc/powerpc32/multiarch/memcpy.S
@@ -34,6 +34,8 @@ ENTRY(memcpy)
        lwz     r6,_rtld_global_ro@got(r5)
        mtlr    r11
        cfi_same_value (lr)
+       cmpdi   r6,0
+       beq     L(ppc32)
        lwz     r6,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET+4(r6)
 # else
        lis     r6,(_dl_hwcap+4)@ha
@@ -48,6 +50,7 @@ ENTRY(memcpy)
        bne-    L(power6)
        andis.  r7,r6,(PPC_FEATURE_CELL_BE >> 16)
        bne-    L(powerCELL)
+L(ppc32):
 # ifdef PIC
        lwz     r3,__memcpy_ppc32@got(r5)
 # else
@@ -103,10 +106,6 @@ END(memcpy)
   cfi_endproc;                                                 \
   ASM_SIZE_DIRECTIVE(__memcpy_ppc32)
 
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name)                         \
-  .globl __GI_memcpy; __GI_memcpy = __memcpy_ppc32
-
 #endif
 
 #include "../memcpy.S"