Merger from rtems-4-6-branch.

This commit is contained in:
Ralf Corsepius
2003-03-04 06:55:35 +00:00
parent 68d4f9e203
commit 5372f167a9
3 changed files with 20 additions and 9 deletions

View File

@@ -1,3 +1,12 @@
2003-03-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/arm.h: Remove ARM_HAS_THUMB (Unused).
2003-03-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/cpu.h: Set up CPU_*_ENDIAN based on -D__ARMEL__ and
-D__ARMEB__. Fix minor typo in comment.
2003-02-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/arm.h: Set up ARM_HAS_FPU based on -D__SOFTFP__.

View File

@@ -32,32 +32,26 @@ extern "C" {
#if defined(__ARM_ARCH_4__)
# define CPU_MODEL_NAME "ARMv4"
# define ARM_HAS_CLZ 0
# define ARM_HAS_THUMB 0
#elif defined(__ARM_ARCH_4T__)
# define CPU_MODEL_NAME "ARMv4T"
# define ARM_HAS_CLZ 0
# define ARM_HAS_THUMB 1
#elif defined(__ARM_ARCH_5__)
# define CPU_MODEL_NAME "ARMv5"
# define ARM_HAS_CLZ 1
# define ARM_HAS_THUMB 0
#elif defined(__ARM_ARCH_5T__)
# define CPU_MODEL_NAME "ARMv5T"
# define ARM_HAS_CLZ 1
# define ARM_HAS_THUMB 1
#elif defined(__ARM_ARCH_5E__)
# define CPU_MODEL_NAME "ARMv5E"
# define ARM_HAS_CLZ 1
# define ARM_HAS_THUMB 0
#elif defined(__ARM_ARCH_5TE__)
# define CPU_MODEL_NAME "ARMv5TE"
# define ARM_HAS_CLZ 1
# define ARM_HAS_THUMB 1
#else
# error "Unsupported CPU Model"

View File

@@ -278,9 +278,17 @@ extern "C" {
*/
#define CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE
#define CPU_BIG_ENDIAN FALSE
#define CPU_LITTLE_ENDIAN TRUE
#if defined(__ARMEL__)
#define CPU_BIG_ENDIAN FALSE
#define CPU_LITTLE_ENDIAN TRUE
#elif define(__ARMEB__)
#define CPU_BIG_ENDIAN TRUE
#define CPU_LITTLE_ENDIAN FALSE
#else
#error "Unknown endianness"
#endif
/*
* The following defines the number of bits actually used in the
* interrupt field of the task mode. How those bits map to the
@@ -774,7 +782,7 @@ void _CPU_Context_Initialize(
# define _CPU_Priority_bits_index( _priority ) \
(_priority)
# error "Implement CLZ verson of priority bit functions for ARMv5"
# error "Implement CLZ version of priority bit functions for ARMv5"
#endif
/* end of Priority handler macros */