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.
	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.

20 files changed, 97 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog
index 7097a8798c..628f954adc 100644
--- a/c/src/lib/libbsp/m68k/efi332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi332/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am
index c85196df2d..7f7ba63e87 100644
--- a/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi332/wrapup/Makefile.am
@@ -5,7 +5,8 @@
 BSP_PIECES = startup clock console spurious timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
index fceab15ff5..9f76f54e43 100644
--- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi68k/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am
index c85196df2d..7f7ba63e87 100644
--- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am
@@ -5,7 +5,8 @@
 BSP_PIECES = startup clock console spurious timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 403320ce2f..4d1bf321b7 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
index 2d202c2094..e5761a5824 100644
--- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
@@ -10,7 +10,8 @@ endif
 BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 3909c7f69d..1ad7158d8e 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am
index 8ed6f10cc8..5f9bace0b2 100644
--- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am
@@ -6,6 +6,7 @@ BSP_PIECES = startup clock console timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index d68f68edb0..3ae58fce04 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
index 6124dd64aa..1173f171e0 100644
--- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
@@ -11,6 +11,7 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a
 
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
index 28c9308bf9..7665c5ae67 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am
index 56c50fe4e0..f18bd77538 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am
@@ -8,8 +8,9 @@ CPU_PIECES = clock console timer mbus
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-       $(foreach piece, $(CPU_PIECES), $(wildcard \
-           ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \
+    $(foreach piece, $(CPU_PIECES), $(wildcard \
+       ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)) \
     $(wildcard \
     ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index 8e4bf22dfe..767fac1262 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
index c85196df2d..7f7ba63e87 100644
--- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
@@ -5,7 +5,8 @@
 BSP_PIECES = startup clock console spurious timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 1a9da9b169..ac827f57a3 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
index c7855998b0..cd94bdd8f7 100644
--- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
@@ -12,6 +12,7 @@ BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     $(wildcard ../consolex/$(ARCH)/consolex.rel) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 
 LIB = $(ARCH)/libbsp.a
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index c4a1ced1dd..d75ea17206 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Fix bug in previous patch.
diff --git a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am
index 24caed29dd..c23bccac58 100644
--- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am
@@ -5,7 +5,8 @@
 BSP_PIECES = startup clock console timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index 275fc831b1..6a1b7b6b27 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/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.
+	* wrapup/Makefile.am: Pick up memcpy.o from libcpu.
+
 2002-07-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am
index d094f1281b..2b8f292692 100644
--- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am
@@ -11,6 +11,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.o) \
     $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 
 LIB = $(ARCH)/libbsp.a