diff options
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/unix/sysv/linux')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/vfork.S | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h index f62f7d6e9..a3f303ca3 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/allocalim.h @@ -19,7 +19,7 @@ #include <limits.h> -extern inline int __libc_use_alloca (size_t size) +__extern_always_inline int __libc_use_alloca (size_t size) { return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) || __libc_alloca_cutoff (size)); diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/vfork.S index f230c0122..e933eefde 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/vfork.S +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/vfork.S @@ -19,6 +19,7 @@ #include <sysdep-cancel.h> #define _ERRNO_H 1 #include <bits/errno.h> +#include <sys/syscall.h> /* Clone the calling process, but without copying the whole address space. The calling process is suspended until the new process exits or is @@ -39,12 +40,12 @@ ENTRY (__vfork) bf .Lhidden_fork mov.w .L1, r3 - trapa #0x10 + trapa #__SH_SYSCALL_TRAP_BASE mov r0, r1 mov #-12, r2 shad r2, r1 - not r1, r1 // r1=0 means r0 = -1 to -4095 - tst r1, r1 // i.e. error in linux + not r1, r1 /* r1=0 means r0 = -1 to -4095 */ + tst r1, r1 /* i.e. error in linux */ bf .Lpseudo_end SYSCALL_ERROR_HANDLER .Lpseudo_end: @@ -63,7 +64,7 @@ ENTRY (__vfork) .long pthread_create #endif -.Lhidden_fork: +.Lhidden_fork: mov.l .L2, r1 braf r1 nop |