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/bits/uClibc_arch_features.h | |
| 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/bits/uClibc_arch_features.h')
| -rw-r--r-- | libc/sysdeps/linux/sh/bits/uClibc_arch_features.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h index 7b9a0efbb..e2b480e75 100644 --- a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h @@ -6,9 +6,9 @@ #define _BITS_UCLIBC_ARCH_FEATURES_H /* instruction used when calling abort() to kill yourself */ -#if defined(__sh2__) +#if defined(__CONFIG_SH2__) # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #32" -#else /* defined(__sh__) */ +#else # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #0xff" #endif |