diff options
| -rw-r--r-- | make/ChangeLog | 6 | ||||
| -rw-r--r-- | make/custom/p4000.cfg | 12 | ||||
| -rw-r--r-- | make/custom/p4600.cfg | 9 | ||||
| -rw-r--r-- | make/custom/p4650.cfg | 10 |
4 files changed, 27 insertions, 10 deletions
diff --git a/make/ChangeLog b/make/ChangeLog index 8b0390ed68..1cf040d031 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,4 +1,10 @@ +2001-01-08 Joel Sherrill <joel@OARcorp.com> + + * custom/p4000.cfg, custom/p4600.cfg, custom/p4650.cfg: Remove + unneeded definitions when compiled for "mips" rather than "mips64orion." + Correct CPU_CFLAGS. + 2001-01-05 Joel Sherrill <joel@OARcorp.com> * custom/gensh1.cfg: Removed rest of make-target-options and diff --git a/make/custom/p4000.cfg b/make/custom/p4000.cfg index 32e10086a5..7c2e22ba4c 100644 --- a/make/custom/p4000.cfg +++ b/make/custom/p4000.cfg @@ -4,15 +4,21 @@ # $Id$ # -# NOTE: this file is broken ! - +# NOTE: This file is shared between the mips and mips64orion +# "ports". The following defines are needed by the mips64orion +# but not the mips. +ifeq ($(RTEMS_CPU),mips64orion) CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 +endif # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=p4000 -# This section makes the target dependent options file. +# This contains the compiler options necessary to select the CPU model +# and (hopefully) optimize for it. +CPU_CFLAGS = -mips3 -G0 +# This section makes the target dependent options file. define make-target-options endef diff --git a/make/custom/p4600.cfg b/make/custom/p4600.cfg index 4dd64d9d7d..d97013ff6d 100644 --- a/make/custom/p4600.cfg +++ b/make/custom/p4600.cfg @@ -6,8 +6,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg -# I think we can get this from the generated target.cfg. -# RTEMS_CPU=mips RTEMS_CPU_MODEL=R4600 # This is the actual bsp directory used during the build process. @@ -16,10 +14,15 @@ RTEMS_BSP_FAMILY=p4000 CPU_CFLAGS=-mcpu=4600 -G0 CCMIPS_CFLAGS_CPU=-cpu=r4600 +ifeq ($(RTEMS_CPU),mips64orion) CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 +endif -# This section makes the target dependent options file. +# This contains the compiler options necessary to select the CPU model +# and (hopefully) optimize for it. +CPU_CFLAGS = -mips3 -G0 +# This section makes the target dependent options file. define make-target-options endef diff --git a/make/custom/p4650.cfg b/make/custom/p4650.cfg index 2672ef80aa..7e672a43d2 100644 --- a/make/custom/p4650.cfg +++ b/make/custom/p4650.cfg @@ -6,20 +6,22 @@ include $(RTEMS_ROOT)/make/custom/default.cfg -# I think we can get this from the generated target.cfg. -# RTEMS_CPU=mips RTEMS_CPU_MODEL=R4650 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=p4000 -CPU_CFLAGS=-m4650 -G0 CCMIPS_CFLAGS_CPU=-cpu=r4650 +ifeq ($(RTEMS_CPU),mips64orion) CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 +endif -# This section makes the target dependent options file. +# This contains the compiler options necessary to select the CPU model +# and (hopefully) optimize for it. +CPU_CFLAGS = -m4650 -mips3 -G0 +# This section makes the target dependent options file. define make-target-options endef |