diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h index d1891698f5..31dd15ecc4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/libc-vdso.h @@ -41,7 +41,7 @@ extern void *__vdso_sigtramp32; extern void *__vdso_sigtramp_rt32; #endif -#if defined(__PPC64__) || defined(__powerpc64__) +#if (defined(__PPC64__) || defined(__powerpc64__)) && _CALL_ELF != 2 /* The correct solution is for _dl_vdso_vsym to return the address of the OPD for the kernel VDSO function. That address would then be stored in the __vdso_* variables and returned as the result of the IFUNC resolver function. diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h index 4263b1aed1..d043968a03 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h @@ -23,6 +23,8 @@ /* Now define our stuff. */ +#if _CALL_ELF != 2 + static __always_inline bool _dl_ppc64_is_opd_sym (const struct link_map *l, const ElfW(Sym) *sym) { @@ -73,4 +75,6 @@ _dl_ppc64_addr_sym_match (const struct link_map *l, const ElfW(Sym) *sym, #define DL_ADDR_SYM_MATCH(L, SYM, MATCHSYM, ADDR) \ _dl_ppc64_addr_sym_match (L, SYM, MATCHSYM, ADDR) +#endif + #endif /* ldsodefs.h */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S index a7b0a18108..b6d82bdd19 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -111,6 +111,7 @@ L(parmloop): L(noparms): +#if _CALL_ELF != 2 /* Load the function address and TOC from the function descriptor and store them in the ucontext as NIP and r2. Store the 3rd field of the function descriptor into the ucontext as r11 in case @@ -121,6 +122,12 @@ L(noparms): std r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3) std r10,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3) std r9,(SIGCONTEXT_GP_REGS+(PT_R11*8))(r3) +#else + /* In the ELFv2 ABI, the function pointer is already the address. + Store it as NIP and r12 as required by the ABI. */ + std r4,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3) + std r4,(SIGCONTEXT_GP_REGS+(PT_R12*8))(r3) +#endif /* If the target function returns we need to do some cleanup. We use a code trick to get the address of our cleanup function into the link |