diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /cpukit/score/cpu/i960 | |
parent | Purged as many egcs references as possible. (diff) | |
download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 |
Merged from 4.5.0-beta3a
Diffstat (limited to 'cpukit/score/cpu/i960')
-rw-r--r-- | cpukit/score/cpu/i960/Makefile.am | 7 | ||||
-rw-r--r-- | cpukit/score/cpu/i960/rtems/score/i960.h | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index 9e45e1dcd4..f26a4e9382 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal @@ -38,7 +38,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o -all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ + $(TMPINSTALL_FILES) .PRECIOUS: $(REL) diff --git a/cpukit/score/cpu/i960/rtems/score/i960.h b/cpukit/score/cpu/i960/rtems/score/i960.h index ae9a073aff..644bd18a0b 100644 --- a/cpukit/score/cpu/i960/rtems/score/i960.h +++ b/cpukit/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__ |