diff options
Diffstat (limited to '')
| -rw-r--r-- | c/src/exec/score/cpu/unix/cpu.c | 8 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/unix/cpu.h | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/c/src/exec/score/cpu/unix/cpu.c b/c/src/exec/score/cpu/unix/cpu.c index e931775c54..428ae99c3b 100644 --- a/c/src/exec/score/cpu/unix/cpu.c +++ b/c/src/exec/score/cpu/unix/cpu.c @@ -174,7 +174,7 @@ void _CPU_Signal_initialize( void ) void _CPU_Context_From_CPU_Init() { -#if defined(hppa1_1) && defined(RTEMS_UNIXLIB_SETJMP) +#if defined(__hppa__) && defined(RTEMS_UNIXLIB_SETJMP) /* * HACK - set the _SYSTEM_ID to 0x20c so that setjmp/longjmp * will handle the full 32 floating point registers. @@ -474,7 +474,7 @@ void _CPU_Context_Initialize( addr = (unsigned32 *)_the_context; -#if defined(hppa1_1) +#if defined(__hppa__) *(addr + RP_OFF) = jmp_addr; *(addr + SP_OFF) = (unsigned32)(_stack_low + CPU_FRAME_SIZE); @@ -489,7 +489,7 @@ void _CPU_Context_Initialize( jmp_addr &= 0xfffffffc; *(addr + RP_OFF) = *(unsigned32 *)jmp_addr; } -#elif defined(sparc) +#elif defined(__sparc__) /* * See /usr/include/sys/stack.h in Solaris 2.3 for a nice @@ -502,7 +502,7 @@ void _CPU_Context_Initialize( *(addr + SP_OFF) = (unsigned32)(_stack_high - CPU_FRAME_SIZE); *(addr + FP_OFF) = (unsigned32)(_stack_high); -#elif defined(i386) || defined(__i386__) +#elif defined(__i386__) /* * This information was gathered by disassembling setjmp(). diff --git a/c/src/exec/score/cpu/unix/cpu.h b/c/src/exec/score/cpu/unix/cpu.h index 9497ca24f7..13558267a0 100644 --- a/c/src/exec/score/cpu/unix/cpu.h +++ b/c/src/exec/score/cpu/unix/cpu.h @@ -242,9 +242,9 @@ extern "C" { * If FALSE, then the grows toward smaller addresses. */ -#if defined(hppa1_1) +#if defined(__hppa__) #define CPU_STACK_GROWS_UP TRUE -#elif defined(sparc) || defined(i386) || defined(__i386__) +#elif defined(__sparc__) || defined(__i386__) #define CPU_STACK_GROWS_UP FALSE #else #error "unknown CPU!!" @@ -282,11 +282,11 @@ extern "C" { * routines are handled. */ -#if defined(hppa1_1) || defined(sparc) +#if defined(__hppa__) || defined(__sparc__) #define CPU_CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE #define CPU_BIG_ENDIAN TRUE #define CPU_LITTLE_ENDIAN FALSE -#elif defined(i386) || defined(__i386__) +#elif defined(__i386__) #define CPU_CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE #define CPU_BIG_ENDIAN FALSE #define CPU_LITTLE_ENDIAN TRUE @@ -313,7 +313,7 @@ extern "C" { /* may need to put some structures here. */ -#if defined(hppa1_1) +#if defined(__hppa__) /* * Word indices within a jmp_buf structure */ @@ -363,7 +363,7 @@ extern "C" { #endif #endif -#if defined(i386) || defined(__i386__) +#if defined(__i386__) #ifdef RTEMS_NEWLIB #error "Newlib not installed" @@ -384,7 +384,7 @@ extern "C" { #endif -#if defined(sparc) +#if defined(__sparc__) /* * Word indices within a jmp_buf structure @@ -550,11 +550,11 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)(); * The size of a frame on the stack */ -#if defined(hppa1_1) +#if defined(__hppa__) #define CPU_FRAME_SIZE (32 * 4) -#elif defined(sparc) +#elif defined(__sparc__) #define CPU_FRAME_SIZE (112) /* based on disassembled test code */ -#elif defined(i386) || defined(__i386__) +#elif defined(__i386__) #define CPU_FRAME_SIZE (24) /* return address, sp, and bp pushed plus fudge */ #else #error "Unknown CPU!!!" |