diff options
Diffstat (limited to 'c/src/exec/score/cpu/i960/rtems/score')
-rw-r--r-- | c/src/exec/score/cpu/i960/rtems/score/Makefile.am | 9 | ||||
-rw-r--r-- | c/src/exec/score/cpu/i960/rtems/score/i960.h | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.am b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am index 9614ab9e49..c7c8212303 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES) # (OPTIONAL) Add local stuff here using += # -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems/score \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/i960/rtems/score/i960.h b/c/src/exec/score/cpu/i960/rtems/score/i960.h index ae9a073aff..644bd18a0b 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/i960.h +++ b/c/src/exec/score/cpu/i960/rtems/score/i960.h @@ -33,7 +33,18 @@ extern "C" { * NOTE: RTEMS defines a canonical name for each cpu model. */ -#if defined(__i960CA__) || defined(__i960_CA__) || defined(__i960CA) +#if defined(rtems_multilib) +/* + * Figure out all CPU Model Feature Flags based upon compiler + * predefines. + */ + +#define CPU_MODEL_NAME "rtems_multilib" +#define I960_HAS_FPU 0 +#define I960_CPU_ALIGNMENT 4 +#define I960_SOFT_RESET_COMMAND 0x30000 + +#elif defined(__i960CA__) || defined(__i960_CA__) || defined(__i960CA) #define CPU_MODEL_NAME "i960ca" #define __RTEMS_I960CA__ |