diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2007-04-28 02:10:47 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2007-04-28 02:10:47 +0400 |
| commit | 643aff874ddda6732805c498908bd59eebc1680a (patch) | |
| tree | 5f3d0f21cf230385bef962b8d60fab704e6491f4 /newlib/libc/machine/m68k | |
| parent | 9e5957de577baa60d32f9137ff2d521326dea1dd (diff) | |
2007-04-27 Jeff Johnston <jjohnstn@redhat.com>
* libc/machine/m68k/Makefile.am: Temporarily remove
memcpy.S and memset.S until logic can be confirmed for
!(__mcoldfile__) case.
* libc/machine/m68k/Makefile.in: Regenerated.
Diffstat (limited to 'newlib/libc/machine/m68k')
| -rw-r--r-- | newlib/libc/machine/m68k/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/m68k/Makefile.in | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am index 11d78eb3c..d2a19f1fa 100644 --- a/newlib/libc/machine/m68k/Makefile.am +++ b/newlib/libc/machine/m68k/Makefile.am @@ -8,7 +8,7 @@ AM_CCASFLAGS = $(INCLUDES) noinst_LIBRARIES = lib.a -lib_a_SOURCES = setjmp.S strcpy.c strlen.c memcpy.S memset.S +lib_a_SOURCES = setjmp.S strcpy.c strlen.c lib_a_CCASFLAGS=$(AM_CCASFLAGS) lib_a_CFLAGS=$(AM_CFLAGS) diff --git a/newlib/libc/machine/m68k/Makefile.in b/newlib/libc/machine/m68k/Makefile.in index 0615e51d4..b812487f2 100644 --- a/newlib/libc/machine/m68k/Makefile.in +++ b/newlib/libc/machine/m68k/Makefile.in @@ -56,8 +56,7 @@ ARFLAGS = cru lib_a_AR = $(AR) $(ARFLAGS) lib_a_LIBADD = am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-strcpy.$(OBJEXT) \ - lib_a-strlen.$(OBJEXT) lib_a-memcpy.$(OBJEXT) \ - lib_a-memset.$(OBJEXT) + lib_a-strlen.$(OBJEXT) lib_a_OBJECTS = $(am_lib_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = @@ -182,7 +181,7 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) AM_CCASFLAGS = $(INCLUDES) noinst_LIBRARIES = lib.a -lib_a_SOURCES = setjmp.S strcpy.c strlen.c memcpy.S memset.S +lib_a_SOURCES = setjmp.S strcpy.c strlen.c lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CFLAGS = $(AM_CFLAGS) ACLOCAL_AMFLAGS = -I ../../.. @@ -250,18 +249,6 @@ lib_a-setjmp.o: setjmp.S lib_a-setjmp.obj: setjmp.S $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi` -lib_a-memcpy.o: memcpy.S - $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-memcpy.o `test -f 'memcpy.S' || echo '$(srcdir)/'`memcpy.S - -lib_a-memcpy.obj: memcpy.S - $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-memcpy.obj `if test -f 'memcpy.S'; then $(CYGPATH_W) 'memcpy.S'; else $(CYGPATH_W) '$(srcdir)/memcpy.S'; fi` - -lib_a-memset.o: memset.S - $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-memset.o `test -f 'memset.S' || echo '$(srcdir)/'`memset.S - -lib_a-memset.obj: memset.S - $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-memset.obj `if test -f 'memset.S'; then $(CYGPATH_W) 'memset.S'; else $(CYGPATH_W) '$(srcdir)/memset.S'; fi` - .c.o: $(COMPILE) -c $< |