diff options
author | Aurelien Jarno <aurelien@aurel32.net> | 2016-06-21 23:59:37 +0200 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2016-06-27 09:59:37 +0200 |
commit | b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 (patch) | |
tree | 3bf6a62adb4d7d9b3e039f8fe666e801d69ab8cc /sysdeps/unix/sysv/linux/mips | |
parent | 76a0b73e8102c5bfb5cb791e34992472f5d1d33e (diff) | |
download | glibc-b87c1ec3fa398646f042a68f0ce0f7d09c1348c7.tar glibc-b87c1ec3fa398646f042a68f0ce0f7d09c1348c7.tar.gz glibc-b87c1ec3fa398646f042a68f0ce0f7d09c1348c7.tar.bz2 glibc-b87c1ec3fa398646f042a68f0ce0f7d09c1348c7.zip |
MIPS, SPARC: more fixes to the vfork aliases in libpthread.so
Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS
and SPARC, but failed to do it correctly, introducing an ABI change.
This patch does the remaining changes needed to align the MIPS and SPARC
vfork implementations with the other architectures. That way the the
alpha version of pt-vfork.S works correctly for MIPS and SPARC. The
changes for alpha were done in 82aab97c.
Changelog:
* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into
__libc_vfork.
(__vfork) [IS_IN (libc)]: Remove alias.
(__libc_vfork) [IS_IN (libc)]: Define as an alias.
* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips')
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/vfork.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S index c0c0ce6991..1867c8626e 100644 --- a/sysdeps/unix/sysv/linux/mips/vfork.S +++ b/sysdeps/unix/sysv/linux/mips/vfork.S @@ -31,13 +31,13 @@ LOCALSZ= 1 FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK GPOFF= FRAMESZ-(1*SZREG) -NESTED(__vfork,FRAMESZ,sp) +NESTED(__libc_vfork,FRAMESZ,sp) #ifdef __PIC__ SETUP_GP #endif PTR_SUBU sp, FRAMESZ cfi_adjust_cfa_offset (FRAMESZ) - SETUP_GP64_REG (a5, __vfork) + SETUP_GP64_REG (a5, __libc_vfork) #ifdef __PIC__ SAVE_GP (GPOFF) #endif @@ -104,10 +104,10 @@ L(error): RESTORE_GP64_REG j __syscall_error #endif - END(__vfork) + END(__libc_vfork) #if IS_IN (libc) -libc_hidden_def(__vfork) -weak_alias (__vfork, vfork) -strong_alias (__vfork, __libc_vfork) +weak_alias (__libc_vfork, vfork) +strong_alias (__libc_vfork, __vfork) +libc_hidden_def (__vfork) #endif |