2006-05-01 Jeff Johnston <jjohnstn@redhat.com>

        * libc/argz/Makefile.am: Prefix any objects specified with $(lpfx).  If source file can
        be specified instead of object, do so.
        * libc/ctype/Makefile.am: Ditto.
        * libc/iconv/ccs/Makefile.am: Ditto.
        * libc/iconv/ces/Makefile.am: Ditto.
        * libc/iconv/lib/Makefile.am: Ditto.
        * libc/locale/Makefile.am: Ditto.
        * libc/posix/Makefile.am: Ditto.
        * libc/reent/Makefile.am: Ditto.
        * libc/search/Makefile.am: Ditto.
        * libc/stdio/Makefile.am: Ditto.
        * libc/stdio64/Makefile.am: Ditto.
        * libc/stdlib/Makefile.am: Ditto.
        * libc/string/Makefile.am: Ditto.
        * libc/syscalls/Makefile.am: Ditto.
        * libc/unix/Makefile.am: Ditto.
        * libc/machine/a29k/Makefile.am: Specify lib_a_CCASFLAGS so .S files will get
        prefix added automatically.  Any specified rules must use $(lpfx) for
        object file names.
        * libc/machine/arm/Makefile.am: Ditto.
        * libc/machine/cris/Makefile.am: Ditto.
        * libc/machine/crx/Makefile.am: Ditto.
        * libc/machine/d10v/Makefile.am: Ditto.
        * libc/machine/d30v/Makefile.am: Ditto.
        * libc/machine/fr30/Makefile.am: Ditto.
        * libc/machine/frv/Makefile.am: Ditto.
        * libc/machine/h8300/Makefile.am: Ditto.
        * libc/machine/h8500/Makefile.am: Ditto.
        * libc/machine/hppa/Makefile.am: Ditto.
        * libc/machine/i386/Makefile.am: Ditto.
        * libc/machine/i960/Makefile.am: Ditto.
        * libc/machine/iq2000/Makefile.am: Ditto.
        * libc/machine/m32c/Makefile.am: Ditto.
        * libc/machine/m32r/Makefile.am: Ditto.
        * libc/machine/m68hc11/Makefile.am: Ditto.
        * libc/machine/m68k/Makefile.am: Ditto.
        * libc/machine/m88k/Makefile.am: Ditto.
        * libc/machine/mips/Makefile.am: Ditto.
        * libc/machine/mn10200/Makefile.am: Ditto.
        * libc/machine/mn10300/Makefile.am: Ditto.
        * libc/machine/mt/Makefile.am: Ditto.
        * libc/machine/necv70/Makefile.am: Ditto.
        * libc/machine/powerpc/Makefile.am: Ditto.
        * libc/machine/sh/Makefile.am: Ditto.
        * libc/machine/sh/Makefile.in: Ditto.
        * libc/machine/sparc/Makefile.am: Ditto.
        * libc/machine/tic4x/Makefile.am: Ditto.
        * libc/machine/tic80/Makefile.am: Ditto.
        * libc/machine/v850/Makefile.am: Ditto.
        * libc/machine/w65/Makefile.am: Ditto.
        * libc/machine/xscale/Makefile.am: Ditto.
        * libc/machine/xstormy16/Makefile.am: Ditto.
        * libc/machine/z8k/Makefile.am: Ditto.
        * libc/sys/a29khif/Makefile.am: Ditto.
        * libc/sys/arm/Makefile.am: Ditto.
        * libc/sys/d10v/Makefile.am: Ditto.
        * libc/sys/h8300hms/Makefile.am: Ditto.
        * libc/sys/h8500hms/Makefile.am: Ditto.
        * libc/sys/linux/Makefile.am: Ditto.
        * libc/sys/linux/linuxthreads/Makefile.am: Ditto.
        * libc/sys/linux/net/Makefile.am: Ditto.
        * libc/sys/linux/stdlib/Makefile.am: Ditto.
        * libc/sys/m88kbug/Makefile.am: Ditto.
        * libc/sys/mmixware/Makefile.am: Ditto.
        * libc/sys/rdos/Makefile.am: Ditto.
        * libc/sys/rtems/Makefile.am: Ditto.
        * libc/sys/sh/Makefile.am: Ditto.
        * libc/sys/sun4/Makefile.am: Ditto.
        * libc/sys/sysmec/Makefile.am: Ditto.
        * libc/sys/sysnec810/Makefile.am: Ditto.
        * libc/sys/sysnecv850/Makefile.am: Ditto.
        * libc/sys/sysvi386/Makefile.am: Ditto.
        * libc/sys/sysvnecv70/Makefile.am: Ditto.
        * libc/sys/tic80/Makefile.am: Ditto.
        * libc/sys/w65/Makefile.am: Ditto.
        * libc/sys/z8ksim/Makefile.am: Ditto.
        * libc/machine/necv70/fastmath.S: Renamed from .s file.
        * libc/machine/necv70/setjmp.S: Ditto.
        * libc/machine/necv70/fastmath.s: Removed.
        * libc/machine/necv70/setjmp.s: Ditto.
        * libc/machine/w65/*.S: New files renamed from .s files.
        * libc/machine/w65/*.s: Renamed and removed.
        * libc/sys/a29khif/*.S: New files renamed from .s files.
        * libc/sys/a29khif/*.s: Renamed and removed.
        * libc/sys/sysvi386/*.S: New files renamed from .s files.
        * libc/sys/sysvi386/*.s: Renamed and removed.
        * libc/sys/sysvnecv70/*.S: New files renamed from .s files.
        * libc/sys/sysvnecv70/*.s: Renamed and removed.
        * libc/*Makefile.in: Regenerated as appropriate.

7 files changed, 67 insertions, 12 deletions

diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index 2e784ec38..3b814887f 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -8,8 +8,10 @@ AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = udivhi3.s umodhi3.s smulhi3.s lshrhi.s sdivhi3.s mulsi3.c \
+lib_a_SOURCES = udivhi3.S umodhi3.S smulhi3.S lshrhi.S sdivhi3.S mulsi3.c \
 	divsi3.c cmpsi.c
+lib_a_CCASFLAGS = $(AM_CCASFLAGS)
+lib_a_CFLAGS = $(AM_CFLAGS)
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/w65/Makefile.in b/newlib/libc/machine/w65/Makefile.in
index a1dc1f1b3..13cd96980 100644
--- a/newlib/libc/machine/w65/Makefile.in
+++ b/newlib/libc/machine/w65/Makefile.in
@@ -41,7 +41,9 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/../../../../config.guess \
 	$(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
+	$(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \
+	$(srcdir)/../../../../compile $(srcdir)/../../../../compile \
+	$(srcdir)/../../../../compile
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
@@ -56,18 +58,19 @@ LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
 lib_a_LIBADD =
-am_lib_a_OBJECTS = udivhi3.$(OBJEXT) umodhi3.$(OBJEXT) \
-	smulhi3.$(OBJEXT) lshrhi.$(OBJEXT) sdivhi3.$(OBJEXT) \
-	mulsi3.$(OBJEXT) divsi3.$(OBJEXT) cmpsi.$(OBJEXT)
+am_lib_a_OBJECTS = lib_a-udivhi3.$(OBJEXT) lib_a-umodhi3.$(OBJEXT) \
+	lib_a-smulhi3.$(OBJEXT) lib_a-lshrhi.$(OBJEXT) \
+	lib_a-sdivhi3.$(OBJEXT) lib_a-mulsi3.$(OBJEXT) \
+	lib_a-divsi3.$(OBJEXT) lib_a-cmpsi.$(OBJEXT)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp =
 am__depfiles_maybe =
+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
 SOURCES = $(lib_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
@@ -181,15 +184,17 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = udivhi3.s umodhi3.s smulhi3.s lshrhi.s sdivhi3.s mulsi3.c \
+lib_a_SOURCES = udivhi3.S umodhi3.S smulhi3.S lshrhi.S sdivhi3.S mulsi3.c \
 	divsi3.c cmpsi.c
 
+lib_a_CCASFLAGS = $(AM_CCASFLAGS)
+lib_a_CFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj .s
+.SUFFIXES: .S .c .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -237,17 +242,65 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+.S.o:
+	$(CCASCOMPILE) -c $<
+
+.S.obj:
+	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+
+lib_a-udivhi3.o: udivhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-udivhi3.o `test -f 'udivhi3.S' || echo '$(srcdir)/'`udivhi3.S
+
+lib_a-udivhi3.obj: udivhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-udivhi3.obj `if test -f 'udivhi3.S'; then $(CYGPATH_W) 'udivhi3.S'; else $(CYGPATH_W) '$(srcdir)/udivhi3.S'; fi`
+
+lib_a-umodhi3.o: umodhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-umodhi3.o `test -f 'umodhi3.S' || echo '$(srcdir)/'`umodhi3.S
+
+lib_a-umodhi3.obj: umodhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-umodhi3.obj `if test -f 'umodhi3.S'; then $(CYGPATH_W) 'umodhi3.S'; else $(CYGPATH_W) '$(srcdir)/umodhi3.S'; fi`
+
+lib_a-smulhi3.o: smulhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-smulhi3.o `test -f 'smulhi3.S' || echo '$(srcdir)/'`smulhi3.S
+
+lib_a-smulhi3.obj: smulhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-smulhi3.obj `if test -f 'smulhi3.S'; then $(CYGPATH_W) 'smulhi3.S'; else $(CYGPATH_W) '$(srcdir)/smulhi3.S'; fi`
+
+lib_a-lshrhi.o: lshrhi.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-lshrhi.o `test -f 'lshrhi.S' || echo '$(srcdir)/'`lshrhi.S
+
+lib_a-lshrhi.obj: lshrhi.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-lshrhi.obj `if test -f 'lshrhi.S'; then $(CYGPATH_W) 'lshrhi.S'; else $(CYGPATH_W) '$(srcdir)/lshrhi.S'; fi`
+
+lib_a-sdivhi3.o: sdivhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-sdivhi3.o `test -f 'sdivhi3.S' || echo '$(srcdir)/'`sdivhi3.S
+
+lib_a-sdivhi3.obj: sdivhi3.S
+	$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-sdivhi3.obj `if test -f 'sdivhi3.S'; then $(CYGPATH_W) 'sdivhi3.S'; else $(CYGPATH_W) '$(srcdir)/sdivhi3.S'; fi`
+
 .c.o:
 	$(COMPILE) -c $<
 
 .c.obj:
 	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-.s.o:
-	$(CCASCOMPILE) -c $<
+lib_a-mulsi3.o: mulsi3.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-mulsi3.o `test -f 'mulsi3.c' || echo '$(srcdir)/'`mulsi3.c
 
-.s.obj:
-	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+lib_a-mulsi3.obj: mulsi3.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-mulsi3.obj `if test -f 'mulsi3.c'; then $(CYGPATH_W) 'mulsi3.c'; else $(CYGPATH_W) '$(srcdir)/mulsi3.c'; fi`
+
+lib_a-divsi3.o: divsi3.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-divsi3.o `test -f 'divsi3.c' || echo '$(srcdir)/'`divsi3.c
+
+lib_a-divsi3.obj: divsi3.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-divsi3.obj `if test -f 'divsi3.c'; then $(CYGPATH_W) 'divsi3.c'; else $(CYGPATH_W) '$(srcdir)/divsi3.c'; fi`
+
+lib_a-cmpsi.o: cmpsi.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-cmpsi.o `test -f 'cmpsi.c' || echo '$(srcdir)/'`cmpsi.c
+
+lib_a-cmpsi.obj: cmpsi.c
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-cmpsi.obj `if test -f 'cmpsi.c'; then $(CYGPATH_W) 'cmpsi.c'; else $(CYGPATH_W) '$(srcdir)/cmpsi.c'; fi`
 uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/newlib/libc/machine/w65/lshrhi.s b/newlib/libc/machine/w65/lshrhi.S
index 564229f57..564229f57 100644..100755
--- a/newlib/libc/machine/w65/lshrhi.s
+++ b/newlib/libc/machine/w65/lshrhi.S
diff --git a/newlib/libc/machine/w65/sdivhi3.s b/newlib/libc/machine/w65/sdivhi3.S
index 7958f11e7..7958f11e7 100644..100755
--- a/newlib/libc/machine/w65/sdivhi3.s
+++ b/newlib/libc/machine/w65/sdivhi3.S
diff --git a/newlib/libc/machine/w65/smulhi3.s b/newlib/libc/machine/w65/smulhi3.S
index 6ccbfba01..6ccbfba01 100644..100755
--- a/newlib/libc/machine/w65/smulhi3.s
+++ b/newlib/libc/machine/w65/smulhi3.S
diff --git a/newlib/libc/machine/w65/udivhi3.s b/newlib/libc/machine/w65/udivhi3.S
index 07d091e80..07d091e80 100644..100755
--- a/newlib/libc/machine/w65/udivhi3.s
+++ b/newlib/libc/machine/w65/udivhi3.S
diff --git a/newlib/libc/machine/w65/umodhi3.s b/newlib/libc/machine/w65/umodhi3.S
index 1d12df524..1d12df524 100644..100755
--- a/newlib/libc/machine/w65/umodhi3.s
+++ b/newlib/libc/machine/w65/umodhi3.S