diff options
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/elf/rtld-global-offsets.sym | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/fpu/setjmp-common.S | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/__longjmp-common.S | 18 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/setjmp-common.S | 18 |
5 files changed, 26 insertions, 26 deletions
diff --git a/sysdeps/powerpc/elf/rtld-global-offsets.sym b/sysdeps/powerpc/elf/rtld-global-offsets.sym index 6bc8aaac55..830106ba21 100644 --- a/sysdeps/powerpc/elf/rtld-global-offsets.sym +++ b/sysdeps/powerpc/elf/rtld-global-offsets.sym @@ -2,6 +2,6 @@ #include <ldsodefs.h> -#define rtdl_global_offsetof(mem) offsetof (struct rtld_global, mem) +#define rtdl_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) -RTLD_GLOBAL_DL_HWCAP_OFFSET rtdl_global_offsetof (_dl_hwcap) +RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtdl_global_ro_offsetof (_dl_hwcap) diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S index 60f1df7d46..dbb28aef21 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -36,11 +36,11 @@ ENTRY (BP_SYM (__longjmp)) bl _GLOBAL_OFFSET_TABLE_@local-4 mflr r5 # ifdef SHARED - lwz r5,_rtld_global@got(r5) + lwz r5,_rtld_global_ro@got(r5) mtlr r6 - lwz r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) + lwz r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) # else - lwz r5,_rtld_global@got(r5) + lwz r5,_rtld_global_ro@got(r5) mtlr r6 lwz r5,0(r5) # endif diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S index b69ce33755..6f63512e61 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S @@ -79,11 +79,11 @@ ENTRY (BP_SYM (__sigsetjmp)) bl _GLOBAL_OFFSET_TABLE_@local-4 mflr r5 #ifdef SHARED - lwz r5,_rtld_global@got(r5) + lwz r5,_rtld_global_ro@got(r5) mtlr r6 - lwz r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) + lwz r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) #else - lwz r5,_rtld_global@got(r5) + lwz r5,_rtld_global_ro@got(r5) mtlr r6 lwz r5,0(r5) #endif diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S index df316234d9..0e2f0d580f 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -32,11 +32,11 @@ #ifndef __NO_VMX__ .section ".toc","aw" .LC__dl_hwcap: -#ifdef SHARED - .tc _rtld_global[TC],_rtld_global -#else +# ifdef SHARED + .tc _rtld_global_ro[TC],_rtld_global_ro +# else .tc _dl_hwcap[TC],_dl_hwcap -#endif +# endif .section ".text" #endif @@ -44,12 +44,12 @@ ENTRY (BP_SYM (__longjmp)) CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) #ifndef __NO_VMX__ ld r5,.LC__dl_hwcap@toc(r2) -#ifdef SHARED +# ifdef SHARED /* Load _rtld-global._dl_hwcap. */ - ld r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) -#else + ld r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) +# else ld r5,0(r5) /* Load extern _dl_hwcap. */ -#endif +# endif andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16) beq no_vmx la r5,((JB_VRS)*8)(3) @@ -63,7 +63,7 @@ ENTRY (BP_SYM (__longjmp)) addi r5,r5,32 lvx v21,0,r6 vperm v20,v1,v21,v0 -#define load_misaligned_vmx_lo_loaded(loadvr,lovr,shiftvr,loadgpr,addgpr) \ +# define load_misaligned_vmx_lo_loaded(loadvr,lovr,shiftvr,loadgpr,addgpr) \ addi addgpr,addgpr,32; \ lvx lovr,0,loadgpr; \ vperm loadvr,loadvr,lovr,shiftvr; diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S index 541b5d4276..85c840348d 100644 --- a/sysdeps/powerpc/powerpc64/setjmp-common.S +++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -31,11 +31,11 @@ #ifndef __NO_VMX__ .section ".toc","aw" .LC__dl_hwcap: -#ifdef SHARED - .tc _rtld_global[TC],_rtld_global -#else +# ifdef SHARED + .tc _rtld_global_ro[TC],_rtld_global_ro +# else .tc _dl_hwcap[TC],_dl_hwcap -#endif +# endif .section ".text" #endif @@ -85,12 +85,12 @@ ENTRY (BP_SYM (__sigsetjmp)) stfd fp31,((JB_FPRS+17)*8)(3) #ifndef __NO_VMX__ ld r5,.LC__dl_hwcap@toc(r2) -#ifdef SHARED +# ifdef SHARED /* Load _rtld-global._dl_hwcap. */ - ld r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) -#else + ld r5,RTLD_GLOBAL_RO_DL_HWCAP_OFFSET(r5) +# else ld r5,0(r5) /* Load extern _dl_hwcap. */ -#endif +# endif andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16) beq no_vmx la r5,((JB_VRS)*8)(3) @@ -114,7 +114,7 @@ ENTRY (BP_SYM (__sigsetjmp)) vsel v20,v20,v2,v3 stvx v5,0,r5 -#define save_2vmx_partial(savevr,prev_savevr,hivr,shiftvr,maskvr,savegpr,addgpr) \ +# define save_2vmx_partial(savevr,prev_savevr,hivr,shiftvr,maskvr,savegpr,addgpr) \ addi addgpr,addgpr,32; \ vperm savevr,savevr,savevr,shiftvr; \ vsel hivr,prev_savevr,savevr,maskvr; \ |