diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-24 12:56:51 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-24 12:56:51 +0000 |
| commit | c5ed14844e379eaefaf6cfe27f54d9f17f8984e1 (patch) | |
| tree | 1102b1d3f7df560af2b99f3bdc23f25618239290 /cpukit/score/cpu/arm/rtems/score/arm.h | |
| parent | 2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-c5ed14844e379eaefaf6cfe27f54d9f17f8984e1.tar.bz2 | |
2011-09-24 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/armv7m.h, armv7m-context-initialize.c,
armv7m-context-restore.c, armv7m-context-switch.c,
armv7m-exception-handler-get.c, armv7m-exception-handler-set.c,
armv7m-exception-priority-get.c, armv7m-exception-priority-set.c,
armv7m-initialize.c, armv7m-isr-dispatch.c, armv7m-isr-enter-leave.c,
armv7m-isr-level-get.c, armv7m-isr-level-set.c,
armv7m-isr-vector-install.c, armv7m-multitasking-start-stop.c: New
files.
* Makefile.am, preinstall.am: Reflect changes above.
* rtems/score/arm.h: Define ARM_MULTILIB_ARCH_V4 and
ARM_MULTILIB_ARCH_V7M.
* rtems/score/cpu.h, cpu_asm.S, cpu.c, arm_exc_abort.S,
arm_exc_handler_high.c, arm_exc_handler_low.S, arm_exc_interrupt.S:
Define CPU_HAS_HARDWARE_INTERRUPT_STACK to FALSE. Use
ARM_MULTILIB_ARCH_V4 and ARM_MULTILIB_ARCH_V7M.
Diffstat (limited to '')
| -rw-r--r-- | cpukit/score/cpu/arm/rtems/score/arm.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/arm.h b/cpukit/score/cpu/arm/rtems/score/arm.h index 5c47e4c617..c0a7c8bb54 100644 --- a/cpukit/score/cpu/arm/rtems/score/arm.h +++ b/cpukit/score/cpu/arm/rtems/score/arm.h @@ -44,40 +44,52 @@ extern "C" { */ #if defined(__ARM_ARCH_4__) # define CPU_MODEL_NAME "ARMv4" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_4T__) # define CPU_MODEL_NAME "ARMv4T" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_5__) # define CPU_MODEL_NAME "ARMv5" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_5T__) # define CPU_MODEL_NAME "ARMv5T" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_5E__) # define CPU_MODEL_NAME "ARMv5E" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_5TE__) # define CPU_MODEL_NAME "ARMv5TE" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_5TEJ__) # define CPU_MODEL_NAME "ARMv5TEJ" +# define ARM_MULTILIB_ARCH_V4 #elif defined(__ARM_ARCH_6J__) # define CPU_MODEL_NAME "ARMv6J" #elif defined(__ARM_ARCH_6M__) # define CPU_MODEL_NAME "ARMv6M" +# define ARM_MULTILIB_ARCH_V7M #elif defined(__ARM_ARCH_7__) # define CPU_MODEL_NAME "ARMv7" -#elif defined(__ARM_ARCH_7M__) -# define CPU_MODEL_NAME "ARMv7M" - #elif defined(__ARM_ARCH_7A__) # define CPU_MODEL_NAME "ARMv7A" +#elif defined(__ARM_ARCH_7R__) +# define CPU_MODEL_NAME "ARMv7R" + +#elif defined(__ARM_ARCH_7M__) +# define CPU_MODEL_NAME "ARMv7M" +# define ARM_MULTILIB_ARCH_V7M + #else # error "Unsupported CPU Model" |