2002-08-05 Joel Sherrill <joel@OARcorp.com>

	* Per PR260 eliminate use of make-target-options.  This impacted
	RTEMS allowing a distinction between the CPU32 and CPU32+ in the
	SuperCore and required that the m68k optimized memcpy be moved
	to libcpu.
	* custom/gen68360.cfg: Remove make-target-options.

2 files changed, 9 insertions, 12 deletions

diff --git a/make/ChangeLog b/make/ChangeLog
index 0d58d016e5..41db357488 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-05	Joel Sherrill <joel@OARcorp.com>
+
+	* Per PR260 eliminate use of make-target-options.  This impacted
+	RTEMS allowing a distinction between the CPU32 and CPU32+ in the
+	SuperCore and required that the m68k optimized memcpy be moved
+	to libcpu.
+	* custom/gen68360.cfg: Remove make-target-options.
+
 2002-08-01	Joel Sherrill <joel@OARcorp.com>
 
 	* eth_comm.cfg, mbx821_001.cfg, mbx860_002.cfg, mbx860_005b.cfg,
diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg
index ccd102040e..ff13022467 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -9,7 +9,7 @@ RTEMS_CPU=m68k
 ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
 RTEMS_CPU_MODEL=m68040
 else
-RTEMS_CPU_MODEL=mcpu32
+RTEMS_CPU_MODEL=mcpu32p
 endif
 
 include $(RTEMS_ROOT)/make/custom/default.cfg
@@ -30,17 +30,6 @@ endif
 # -O4 is ok for RTEMS
 CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer
 
-#  This section makes the target dependent options file.
-
-ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
-define make-target-options
-endef
-else
-define make-target-options
-	@echo "#define RTEMS__mcpu32p__ 1"                  >>$@
-endef
-endif
-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
 # will be able to override parts of the compilers specs and link using gcc.