diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-02-23 07:00:33 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-02-23 07:00:33 +0000 |
| commit | 1a08441c06b25efb87de33512674e80a8dedc63e (patch) | |
| tree | 001faaca77361f043d9d8ec95f7e8e67e61c775d /libc | |
| parent | 2dca8cd6433fe41213ea5ef769ef8286c1a8a5a1 (diff) | |
Use gcc built-in defines for detecting SH cores instead of
uclibc config option macros (aligning SH to all other archs).
Changes applied as below:
__CONFIG_SH4__ -> __SH4__
__CONFIG_SH2__ -> __sh2__
__CONFIG_SH2A__ -> __SH2A__
Note: pay attention to capital letters
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/sysdeps/linux/sh/___fpscr_values.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/bits/syscalls.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/bits/uClibc_arch_features.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/clone.S | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/sys/ucontext.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/sh/vfork.S | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libc/sysdeps/linux/sh/___fpscr_values.S b/libc/sysdeps/linux/sh/___fpscr_values.S index de8f0b42d..3a1c83183 100644 --- a/libc/sysdeps/linux/sh/___fpscr_values.S +++ b/libc/sysdeps/linux/sh/___fpscr_values.S @@ -21,7 +21,7 @@ #include <features.h> .data -#if defined(__CONFIG_SH4__) +#ifdef __SH4__ .global ___fpscr_values .type ___fpscr_values,@object .size ___fpscr_values,8 diff --git a/libc/sysdeps/linux/sh/bits/syscalls.h b/libc/sysdeps/linux/sh/bits/syscalls.h index 50c3e6099..8b0fb355f 100644 --- a/libc/sysdeps/linux/sh/bits/syscalls.h +++ b/libc/sysdeps/linux/sh/bits/syscalls.h @@ -5,7 +5,7 @@ #endif /* The Linux kernel uses different trap numbers on sh-2. */ -#if defined __CONFIG_SH2__ || defined __CONFIG_SH2A__ +#if defined __sh2__ || defined __SH2A__ # define __SH_SYSCALL_TRAP_BASE 0x20 #else # define __SH_SYSCALL_TRAP_BASE 0x10 diff --git a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h index 4d0845351..faf9d2070 100644 --- a/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h @@ -6,7 +6,7 @@ #define _BITS_UCLIBC_ARCH_FEATURES_H /* instruction used when calling abort() to kill yourself */ -#if defined(__CONFIG_SH2__) +#ifdef __sh2__ # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #32" #else # define __UCLIBC_ABORT_INSTRUCTION__ "trapa #0xff" diff --git a/libc/sysdeps/linux/sh/clone.S b/libc/sysdeps/linux/sh/clone.S index 9446803ba..b912db0ad 100644 --- a/libc/sysdeps/linux/sh/clone.S +++ b/libc/sysdeps/linux/sh/clone.S @@ -62,7 +62,7 @@ clone: mov r6, r4 trapa #(__SH_SYSCALL_TRAP_BASE + 2) mov r0, r1 -#ifdef __CONFIG_SH2__ +#ifdef __sh2__ /* 12 arithmetic shifts for the crappy sh2, because shad doesn't exist! */ shar r1 shar r1 diff --git a/libc/sysdeps/linux/sh/sys/ucontext.h b/libc/sysdeps/linux/sh/sys/ucontext.h index 0996bf2d5..4ed2484bc 100644 --- a/libc/sysdeps/linux/sh/sys/ucontext.h +++ b/libc/sysdeps/linux/sh/sys/ucontext.h @@ -98,7 +98,7 @@ typedef struct unsigned int mach; unsigned int macl; -#ifdef __CONFIG_SH4__ +#ifdef __SH4__ /* FPU registers */ fpregset_t fpregs; fpregset_t xfpregs; diff --git a/libc/sysdeps/linux/sh/vfork.S b/libc/sysdeps/linux/sh/vfork.S index 060a36b33..d311bff12 100644 --- a/libc/sysdeps/linux/sh/vfork.S +++ b/libc/sysdeps/linux/sh/vfork.S @@ -41,7 +41,7 @@ __vfork: mov.w .L2, r3 trapa #__SH_SYSCALL_TRAP_BASE mov r0, r1 -#ifdef __CONFIG_SH2__ +#ifdef __sh2__ /* 12 arithmetic shifts for the crappy sh2, because shad doesn't exist! */ shar r1 shar r1 @@ -72,7 +72,7 @@ __vfork: mov.w .L3, r3 trapa #__SH_SYSCALL_TRAP_BASE mov r0, r1 -#ifdef __CONFIG_SH2__ +#ifdef __sh2__ /* 12 arithmetic shifts for the crappy sh2, because shad doesn't exist! */ shar r1 shar r1 |