RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* 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.
	* shared/misc/memcpy.c: Moved from score/cpu/m68k.
	* configure.ac, shared/Makefile.am: Modified to reflect new directory.
	* shared/misc/.cvsignore, shared/misc/Makefile.am: New file.
This commit is contained in:
Joel Sherrill
2002-08-05 19:03:52 +00:00
parent 75adbe5fed
commit 3f5480c29a
6 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libcpu/m68k/ChangeLog
View File

@@ -1,3 +1,13 @@
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.
* shared/misc/memcpy.c: Moved from score/cpu/m68k.
* configure.ac, shared/Makefile.am: Modified to reflect new directory.
* shared/misc/.cvsignore, shared/misc/Makefile.am: New file.
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: * configure.ac:

7
c/src/lib/libcpu/m68k/configure.ac
View File

@@ -34,12 +34,16 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "m68020" \
|| test "$RTEMS_CPU_MODEL" = "m68040" \ || test "$RTEMS_CPU_MODEL" = "m68040" \
|| test "$RTEMS_CPU_MODEL" = "m68ec040" \ || test "$RTEMS_CPU_MODEL" = "m68ec040" \
|| test "$RTEMS_CPU_MODEL" = "m68lc040" \ || test "$RTEMS_CPU_MODEL" = "m68lc040" \
|| test "$RTEMS_CPU_MODEL" = "m68060" ) || test "$RTEMS_CPU_MODEL" = "m68060" \
|| test "$RTEMS_CPU_MODEL" = "mcpu32" \
|| test "$RTEMS_CPU_MODEL" = "mcpu32p" )
AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040") AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040")
AM_CONDITIONAL(mcf5206, test "$RTEMS_CPU_MODEL" = "mcf5206") AM_CONDITIONAL(mcf5206, test "$RTEMS_CPU_MODEL" = "mcf5206")
AM_CONDITIONAL(mcpu32, test "$RTEMS_CPU_MODEL" = "mcpu32")
case "$RTEMS_CPU_MODEL" in case "$RTEMS_CPU_MODEL" in
mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);; mcf5206 ) AC_CONFIG_SUBDIRS([mcf5206]);;
*) ;; *) ;;
@@ -49,6 +53,7 @@ esac
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
shared/Makefile shared/Makefile
shared/cache/Makefile shared/cache/Makefile
shared/misc/Makefile
m68040/Makefile m68040/Makefile
m68040/fpsp/Makefile]) m68040/fpsp/Makefile])
AC_OUTPUT AC_OUTPUT

2
c/src/lib/libcpu/m68k/shared/Makefile.am
View File

@@ -3,7 +3,7 @@
## ##
SUBDIRS = cache SUBDIRS = cache misc
include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../automake/local.am include $(top_srcdir)/../../../../../automake/local.am

2
c/src/lib/libcpu/m68k/shared/misc/.cvsignore Normal file
View File

@@ -0,0 +1,2 @@
Makefile
Makefile.in

24
c/src/lib/libcpu/m68k/shared/misc/Makefile.am Normal file
View File

@@ -0,0 +1,24 @@
##
## $Id$
##
C_FILES = memcpy.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
# gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to
if mcpu32p
AM_CPPFLAGS += -D__mcpu32p__
endif
all-local: $(ARCH) $(OBJS)
EXTRA_DIST = memcpy.c
include $(top_srcdir)/../../../../../automake/local.am

6
c/src/lib/libcpu/m68k/shared/misc/memcpy.c
View File

@@ -41,6 +41,12 @@
"cc", "memory") "cc", "memory")
#endif #endif
/* gcc doesn't know that cpu32+ is better than cpu32 :( */
#if defined(__mcpu32p__)
#undef M68k_HAS_MISALIGNED
#define M68k_HAS_MISALIGNED 1
#endif
void * void *
memcpy(void *s1, const void *s2, size_t n) memcpy(void *s1, const void *s2, size_t n)
{ {