diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-10-23 04:20:20 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-23 04:20:20 +0000 |
| commit | 0b508dd647e667c92820ddfc82eb5f95b19d2db1 (patch) | |
| tree | 882e403d52d6a21249c00a7b8b451e9c7eec9239 /libc/sysdeps/linux/sh/vfork.S | |
| parent | 44b161a8c584a50d77d63ad553e78991c7dc3617 (diff) | |
Merge SH-2 trapa fixups from Mark.
2006-10-16 Mark Shinwell <shinwell@codesourcery.com>
* libc/sysdeps/linux/sh/vfork.S: Use __SH_SYSCALL_TRAP_BASE.
Also use __CONFIG_SH2__ rather than __sh2__, for consistency.
* libc/sysdeps/linux/sh/syscall.c: Use __SH_SYSCALL_TRAP_BASE.
* libc/sysdeps/linux/sh/bits/uClibc_arch_features.h: Use
__CONFIG_SH2__ rather than __sh2__, for consistency.
* libc/sysdeps/linux/sh/bits/syscalls.h (__SH_SYSCALL_TRAP_BASE):
New.
Use instead of hard-coded trap numbers in the various __NR_<name>
macros.
* libc/sysdeps/linux/sh/clone.S: Use __SH_SYSCALL_TRAP_BASE.
Also use __CONFIG_SH2__ rather than __sh2__, for consistency.
* libc/sysdeps/linux/sh/crti.S: Disable GOT-related code if
__HAVE_SHARED__ is not set.
* libc/sysdeps/linux/sh/pipe.c (pipe): Use __SH_SYSCALL_TRAP_BASE.
Diffstat (limited to 'libc/sysdeps/linux/sh/vfork.S')
| -rw-r--r-- | libc/sysdeps/linux/sh/vfork.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/sh/vfork.S b/libc/sysdeps/linux/sh/vfork.S index d9840946f..b8872e1e8 100644 --- a/libc/sysdeps/linux/sh/vfork.S +++ b/libc/sysdeps/linux/sh/vfork.S @@ -25,6 +25,7 @@ #include <bits/sysnum.h> #define _ERRNO_H 1 #include <bits/errno.h> +#include <bits/syscalls.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,9 +40,9 @@ __vfork: mov.w .L2, r3 - trapa #0x10 + trapa #__SH_SYSCALL_TRAP_BASE mov r0, r1 -#ifdef __sh2__ +#ifdef __CONFIG_SH2__ // 12 arithmetic shifts for the crappy sh2, because shad doesn't exist! shar r1 shar r1 @@ -70,9 +71,9 @@ __vfork: /* If we don't have vfork, use fork. */ mov.w .L3, r3 - trapa #0x10 + trapa #__SH_SYSCALL_TRAP_BASE mov r0, r1 -#ifdef __sh2__ +#ifdef __CONFIG_SH2__ // 12 arithmetic shifts for the crappy sh2, because shad doesn't exist! shar r1 shar r1 |