diff options
-rw-r--r-- | c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h | 16 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/asm.h | 6 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h | 9 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/rtems/score/powerpc.h | 16 |
5 files changed, 8 insertions, 44 deletions
diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h b/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h index 1f14030f4a..8e7c8f45ab 100644 --- a/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h +++ b/c/src/lib/libcpu/powerpc/rtems/powerpc/powerpc.h @@ -295,18 +295,9 @@ extern "C" { * Application binary interfaces. * * PPC_ABI MUST be defined as one of these. - * Only PPC_ABI_POWEROPEN is currently fully supported. - * Only EABI will be supported in the end when - * the tools are there. * Only big endian is currently supported. */ /* - * PowerOpen ABI. This is Andy's hack of the - * PowerOpen ABI to ELF. ELF rather than a - * XCOFF assembler is used. - */ -#define PPC_ABI_POWEROPEN 0 -/* * SVR4 ABI */ #define PPC_ABI_SVR4 2 @@ -323,18 +314,13 @@ extern "C" { #define PPC_ABI PPC_ABI_EABI #endif -#if (PPC_ABI == PPC_ABI_POWEROPEN) -#define PPC_STACK_ALIGNMENT 8 -#elif (PPC_ABI == PPC_ABI_SVR4) +#if (PPC_ABI == PPC_ABI_SVR4) #define PPC_STACK_ALIGNMENT 16 #elif (PPC_ABI == PPC_ABI_EABI) #define PPC_STACK_ALIGNMENT 8 #else #error "PPC_ABI is not properly defined" #endif -#ifndef PPC_ABI -#error "PPC_ABI is not properly defined" -#endif /* * Assemblers. diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index e0b3c99ebb..69cb16b38c 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,5 +1,10 @@ 2005-02-10 Ralf Corsepius <ralf.corsepius@rtems.org> + * rtems/asm.h, rtems/old-exceptions/cpu.h, rtems/score/powerpc.h: + Remove PPC_ABI_POWEROPEN. + +2005-02-10 Ralf Corsepius <ralf.corsepius@rtems.org> + * rtems/score/powerpc.h: Remove hard-coded PPC_HAS_FPU. Tie PPC_HAS_FPU to _SOFT_FLOAT. diff --git a/cpukit/score/cpu/powerpc/rtems/asm.h b/cpukit/score/cpu/powerpc/rtems/asm.h index 2785de2371..a7297caa2c 100644 --- a/cpukit/score/cpu/powerpc/rtems/asm.h +++ b/cpukit/score/cpu/powerpc/rtems/asm.h @@ -60,12 +60,6 @@ #define __FLOAT_REGISTER_PREFIX__ __REGISTER_PREFIX__ #endif -#if (PPC_ABI == PPC_ABI_POWEROPEN) -#ifndef __PROC_LABEL_PREFIX__ -#define __PROC_LABEL_PREFIX__ . -#endif -#endif - #ifndef __PROC_LABEL_PREFIX__ #define __PROC_LABEL_PREFIX__ __USER_LABEL_PREFIX__ #endif diff --git a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h index d95712b6f2..cdcb76df1c 100644 --- a/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h +++ b/cpukit/score/cpu/powerpc/rtems/old-exceptions/cpu.h @@ -372,11 +372,8 @@ typedef struct { typedef struct CPU_Interrupt_frame { uint32_t stacklink; /* Ensure this is a real frame (also reg1 save) */ -#if (PPC_ABI == PPC_ABI_POWEROPEN) - uint32_t dummy[13]; /* Used by callees: PowerOpen ABI */ -#else uint32_t dummy[1]; /* Used by callees: SVR4/EABI */ -#endif + /* This is what is left out of the primary contexts */ uint32_t gpr0; uint32_t gpr2; /* play safe */ @@ -570,12 +567,8 @@ SCORE_EXTERN struct { uint32_t volatile* Disable_level; void *Vector_table; void *Stack; -#if (PPC_ABI == PPC_ABI_POWEROPEN) - uint32_t Dispatch_r2; -#else uint32_t Default_r2; uint32_t Default_r13; -#endif volatile boolean *Switch_necessary; boolean *Signal; diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h index 1f14030f4a..8e7c8f45ab 100644 --- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h +++ b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h @@ -295,18 +295,9 @@ extern "C" { * Application binary interfaces. * * PPC_ABI MUST be defined as one of these. - * Only PPC_ABI_POWEROPEN is currently fully supported. - * Only EABI will be supported in the end when - * the tools are there. * Only big endian is currently supported. */ /* - * PowerOpen ABI. This is Andy's hack of the - * PowerOpen ABI to ELF. ELF rather than a - * XCOFF assembler is used. - */ -#define PPC_ABI_POWEROPEN 0 -/* * SVR4 ABI */ #define PPC_ABI_SVR4 2 @@ -323,18 +314,13 @@ extern "C" { #define PPC_ABI PPC_ABI_EABI #endif -#if (PPC_ABI == PPC_ABI_POWEROPEN) -#define PPC_STACK_ALIGNMENT 8 -#elif (PPC_ABI == PPC_ABI_SVR4) +#if (PPC_ABI == PPC_ABI_SVR4) #define PPC_STACK_ALIGNMENT 16 #elif (PPC_ABI == PPC_ABI_EABI) #define PPC_STACK_ALIGNMENT 8 #else #error "PPC_ABI is not properly defined" #endif -#ifndef PPC_ABI -#error "PPC_ABI is not properly defined" -#endif /* * Assemblers. |