Changeset 5759510 in rtems


Ignore:
Timestamp:
Jan 9, 2015, 12:25:09 PM (5 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
5139d21
Parents:
b1268e6
git-author:
Sebastian Huber <sebastian.huber@…> (01/09/15 12:25:09)
git-committer:
Sebastian Huber <sebastian.huber@…> (01/09/15 13:06:41)
Message:

arm: Fix compile error for ARMv6-M multilib

ARMv6-M is not supported since we cannot directly use the ARMv7-M code
due to some inline assembler statements.

Close #2231.

Location:
cpukit/score/cpu/arm/rtems/score
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/arm/rtems/score/arm.h

    rb1268e6 r5759510  
    3333  #define CPU_MODEL_NAME "ARMv7M"
    3434  #define ARM_MULTILIB_ARCH_V7M
     35#elif defined(__ARM_ARCH_6M__)
     36  #define CPU_MODEL_NAME "ARMv6M"
     37  #define ARM_MULTILIB_ARCH_V6M
    3538#else
    3639  #define CPU_MODEL_NAME "ARMv4"
  • cpukit/score/cpu/arm/rtems/score/cpu.h

    rb1268e6 r5759510  
    261261  uint32_t register_sp;
    262262  uint32_t register_lr;
    263 #elif defined(ARM_MULTILIB_ARCH_V7M)
     263#elif defined(ARM_MULTILIB_ARCH_V6M) || defined(ARM_MULTILIB_ARCH_V7M)
    264264  uint32_t register_r4;
    265265  uint32_t register_r5;
     
    683683  uint32_t register_cpsr;
    684684  Arm_symbolic_exception_name vector;
    685 #elif defined(ARM_MULTILIB_ARCH_V7M)
     685#elif defined(ARM_MULTILIB_ARCH_V6M) || defined(ARM_MULTILIB_ARCH_V7M)
    686686  uint32_t register_xpsr;
    687687  uint32_t vector;
Note: See TracChangeset for help on using the changeset viewer.