diff options
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/futimes.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 13 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S | 22 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/utimes.c | 1 |
4 files changed, 31 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c index bb1f045df5..97a917318e 100644 --- a/sysdeps/unix/sysv/linux/futimes.c +++ b/sysdeps/unix/sysv/linux/futimes.c @@ -36,7 +36,7 @@ __futimes (int fd, const struct timeval tvp[2]) static const char selffd[] = "/proc/self/fd/"; char fname[sizeof (selffd) + 3 * sizeof (int)]; fname[sizeof (fname) - 1] = '\0'; - char *cp = _itoa_word (fd, fname + sizeof (fname) - 1, 10, 0); + char *cp = _itoa_word ((unsigned int) fd, fname + sizeof (fname) - 1, 10, 0); cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1); #ifdef __NR_utimes diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 3dba1de24f..e78c959529 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -234,6 +234,12 @@ # define __ASSUME_NEW_PRCTL_SYSCALL 1 #endif +/* Starting with 2.4.21 the PowerPC32 clone syscall works as expected. */ +#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc__ \ + && !defined __powerpc64__ +# define __ASSUME_FIXED_CLONE_SYSCALL 1 +#endif + /* Starting with 2.4.21 PowerPC64 implements the new rt_sigreturn syscall. The new rt_sigreturn takes an ucontext pointer allowing rt_sigreturn to be used in the set/swapcontext implementation. */ @@ -341,8 +347,11 @@ # define __ASSUME_CORRECT_SI_PID 1 #endif -/* The tgkill syscall was instroduced for i386 in 2.5.75. */ -#if __LINUX_KERNEL_VERSION >= 132427 && defined __i386__ +/* The tgkill syscall was instroduced for i386 in 2.5.75. For Alpha + it was introduced in 2.6.0-test1 which unfortunately cannot be + distinguished from 2.6.0. */ +#if (__LINUX_KERNEL_VERSION >= 132427 && defined __i386__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __alpha__) \ # define __ASSUME_TGKILL 1 #endif diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S index 3bfd025984..11768bcbb7 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S @@ -20,6 +20,7 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> +#include <kernel-features.h> #include <bp-sym.h> #include <bp-asm.h> @@ -44,7 +45,11 @@ ENTRY (BP_SYM (__clone)) /* Set up stack frame for parent. */ stwu r1,-32(r1) +#ifndef __ASSUME_FIXED_CLONE_SYSCALL stmw r29,16(r1) +#else + stmw r30,16(r1) +#endif /* Set up stack frame for child. */ clrrwi r4,r4,4 @@ -52,8 +57,10 @@ ENTRY (BP_SYM (__clone)) stwu r0,-16(r4) /* Save fn, args, stack across syscall. */ - mr r29,r3 /* Function in r29. */ - mr r30,r4 /* Stack pointer in r30. */ + mr r30,r3 /* Function in r30. */ +#ifndef __ASSUME_FIXED_CLONE_SYSCALL + mr r29,r4 /* Stack pointer in r29. */ +#endif mr r31,r6 /* Argument in r31. */ /* 'flags' argument is first parameter to clone syscall. (The other @@ -73,13 +80,16 @@ ENTRY (BP_SYM (__clone)) crandc cr1*4+eq,cr1*4+eq,cr0*4+so bne- cr1,L(parent) /* The '-' is to minimise the race. */ +#ifndef __ASSUME_FIXED_CLONE_SYSCALL /* On at least mklinux DR3a5, clone() doesn't actually change the stack pointer. I'm pretty sure this is a bug, because it adds a race condition if a signal is sent to a thread just after it is created (in the previous three instructions). */ - mr r1,r30 + mr r1,r29 +#endif + /* Call procedure. */ - mtctr r29 + mtctr r30 mr r3,r31 bctrl /* Call _exit with result from procedure. */ @@ -87,7 +97,11 @@ ENTRY (BP_SYM (__clone)) L(parent): /* Parent. Restore registers & return. */ +#ifndef __ASSUME_FIXED_CLONE_SYSCALL lmw r29,16(r1) +#else + lmw r30,16(r1) +#endif addi r1,r1,32 bnslr+ b JUMPTARGET(__syscall_error) diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c index 57b82f9237..6e08c95397 100644 --- a/sysdeps/unix/sysv/linux/utimes.c +++ b/sysdeps/unix/sysv/linux/utimes.c @@ -20,6 +20,7 @@ #include <stddef.h> #include <utime.h> #include <sys/time.h> +#include <sysdep.h> #include "kernel-features.h" |