Fix machine/sys Makefile.am files to not recursively set AM_CCASFLAGS. Properly include top-level Makefile.am which was missing fixes.

120 files changed, 671 insertions, 123 deletions

diff --git a/newlib/Makefile.am b/newlib/Makefile.am
new file mode 100644
index 00000000000..0ac00a34727
--- /dev/null
+++ b/newlib/Makefile.am
@@ -0,0 +1,408 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I .
+
+# Multilib support variables.
+MULTISRCTOP =
+MULTIBUILDTOP =
+MULTIDIRS =
+MULTISUBDIR =
+MULTIDO = true
+MULTICLEAN = true
+
+LIBTOOL_VERSION_INFO = 0:0:0
+
+if NEWLIB_HW_FP
+MATHDIR = mathfp
+else
+MATHDIR = math
+endif
+
+# Work around what appears to be a GNU make bug handling MAKEFLAGS
+# values defined in terms of make variables, as is the case for CC and
+# friends when we are called from the top level Makefile.
+AM_MAKEFLAGS = \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"INSTALL=$(INSTALL)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"top_toollibdir=$(toollibdir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC_FOR_NEWLIB)" \
+	"LD=$(LD)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"NM=$(NM)" \
+	"PICFLAG=$(PICFLAG)" \
+	"RANLIB=$(RANLIB)" \
+	"DESTDIR=$(DESTDIR)"
+
+FLAGS_TO_PASS=$(AM_MAKEFLAGS)
+
+if HAVE_DOC
+DOCDIR = doc
+else
+DOCDIR =
+endif
+
+SUBDIRS = libc libm \
+	$(DOCDIR) . $(EXTRA_DIRS)
+
+tooldir = $(exec_prefix)/$(host_alias)
+toollibdir = $(tooldir)/lib$(MULTISUBDIR)
+
+AR_FLAGS = rc
+
+if USE_LIBTOOL
+toollib_LTLIBRARIES = libm.la \
+	libc.la
+else
+toollib_LIBRARIES = libm.a \
+	libc.a
+endif
+
+noinst_DATA = stmp-targ-include
+
+toollib_DATA = $(CRT0) $(CRT1)
+
+
+# The functions ldexp, frexp and modf are traditionally supplied in
+# both libc.a and libm.a.  We build them in libm.a and copy them over,
+# along with some required supporting routines.
+MATHOBJS_IN_LIBC = \
+	$(lpfx)s_isinf.$(oext) $(lpfx)sf_isinf.$(oext) \
+	$(lpfx)s_isnan.$(oext) $(lpfx)sf_isnan.$(oext) \
+	$(lpfx)s_isinfd.$(oext) $(lpfx)sf_isinff.$(oext) \
+	$(lpfx)s_isnand.$(oext) $(lpfx)sf_isnanf.$(oext) \
+	$(lpfx)s_nan.$(oext) $(lpfx)sf_nan.$(oext) \
+	$(lpfx)s_ldexp.$(oext) $(lpfx)sf_ldexp.$(oext) \
+	$(lpfx)s_frexp.$(oext) $(lpfx)sf_frexp.$(oext) \
+	$(lpfx)s_modf.$(oext) \
+	$(lpfx)sf_modf.$(oext) $(lpfx)s_scalbn.$(oext) \
+	$(lpfx)sf_scalbn.$(oext) \
+	$(lpfx)s_finite.$(oext) $(lpfx)sf_finite.$(oext) \
+	$(lpfx)s_copysign.$(oext) $(lpfx)sf_copysign.$(oext) \
+	$(lpfx)s_infconst.$(oext)
+
+LIBC_OBJECTLISTS = \
+	$(POSIX_OBJECTLIST) \
+	$(SIGNAL_OBJECTLIST) \
+	$(SYSCALL_OBJECTLIST) \
+	$(UNIX_OBJECTLIST) \
+	$(STDIO64_OBJECTLIST) \
+	libc/argz/objectlist.awk.in \
+	libc/stdlib/objectlist.awk.in \
+	libc/time/objectlist.awk.in \
+	libc/ctype/objectlist.awk.in \
+	libc/search/objectlist.awk.in \
+	libc/string/objectlist.awk.in \
+	libc/locale/objectlist.awk.in \
+	libc/misc/objectlist.awk.in \
+	libc/reent/objectlist.awk.in \
+	libc/errno/objectlist.awk.in \
+	libc/stdio/objectlist.awk.in \
+	$(MACHINE_OBJECTLIST) \
+	$(SYS_OBJECTLIST) \
+	$(SYS_MACH_OBJECTLIST)
+
+LIBM_OBJECTLISTS = \
+	libm/$(MATHDIR)/objectlist.awk.in \
+	libm/common/objectlist.awk.in \
+	$(LIBM_MACHINE_OBJECTLIST)
+
+libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libm-libtool-objectlist
+
+libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libc-libtool-objectlist
+
+if USE_LIBTOOL
+libm_la_SOURCES =
+libm_la_DEPENDENCIES = libm-libtool-objectlist
+
+# objects listed later in LIBM_OBJECTLISTS will override those listed earlier
+libm-libtool-objectlist: $(LIBM_OBJECTLISTS)
+	cat $(LIBM_OBJECTLISTS) | $(AWK) '{ libm[$$1] = $$2 }; END { for (x in libm) printf ("%s\n", libm[x]) }' > $@
+
+libc_la_SOURCES =
+libc_la_DEPENDENCIES = libc-libtool-objectlist
+
+# objects listed later in LIBM_OBJECTLISTS and LIBC_OBJECTLISTS will override those listed earlier
+libc-libtool-objectlist: $(LIBM_OBJECTLISTS) $(LIBC_OBJECTLISTS)
+	cat $(LIBM_OBJECTLISTS) $(LIBC_OBJECTLISTS) |  $(AWK) '{ libc[$$1] = $$2 }; END { for (x in libc) printf ("%s\n", libc[x]) }' > $@
+
+else
+
+libc.a: libc/libc.a libm.a
+	rm -rf libc.a libg.a tmp
+	mkdir tmp
+	cd tmp; \
+	 $(AR) x ../libm.a $(MATHOBJS_IN_LIBC) ; \
+	 $(AR) x ../libc/libc.a ; \
+	 $(AR) $(AR_FLAGS) ../$@ *.o
+	$(RANLIB) libc.a
+	ln libc.a libg.a >/dev/null 2>/dev/null || cp libc.a libg.a
+	rm -rf tmp
+
+libc/libc.a: ; @true
+
+libm.a: libm/libm.a
+	rm -f $@
+	ln libm/libm.a $@ >/dev/null 2>/dev/null || cp libm/libm.a $@
+
+libm/libm.a: ; @true
+
+endif # USE_LIBTOOL
+
+crt0.o: $(CRT0_DIR)$(CRT0)
+	rm -f $@
+	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
+	 || cp $(CRT0_DIR)$(CRT0) $@
+
+$(CRT0_DIR)$(CRT0): ; @true
+
+crt1.o: $(CRT1_DIR)$(CRT1)
+	rm -f $@
+	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
+	 || cp $(CRT0_DIR)$(CRT0) $@
+
+$(CRT1_DIR)$(CRT1): ; @true
+
+
+all-recursive: stmp-targ-include
+
+# The targ-include directory just holds the includes files for the
+# particular system and machine we have been configured for.  It is
+# used while building.
+stmp-targ-include: config.status
+	-rm -rf targ-include stmp-targ-include
+	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
+	cp newlib.h targ-include/newlib.h
+	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/sys/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/sys/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done
+	touch $@
+
+CLEANFILES = targ-include stmp-targ-include
+
+install-data-local:	install-toollibLIBRARIES
+if USE_LIBTOOL
+else
+	rm -f $(DESTDIR)$(toollibdir)/libg.a
+	ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
+endif
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
+	-if [ -z "$(MULTISUBDIR)" ]; then \
+	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
+	  for i in $(srcdir)/libc/include/*.h; do \
+	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	  done; \
+	  $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \
+	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \
+	  for i in $(srcdir)/libc/include/machine/*.h; do \
+	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
+	  done; \
+	  for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done; \
+	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/sys; \
+	  for i in $(srcdir)/libc/include/sys/*.h; do \
+	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
+	  done; \
+	  for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/bits; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
+	else true; fi
+
+# Force makedoc to be built before building info files.
+info-recursive: doc/makedoc
+dvi-recursive: doc/makedoc
+doc/makedoc:
+	cd doc && $(MAKE) all
+
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
+
+# Multilib support.
+.PHONY: all-multi check-multi mostlyclean-multi clean-multi distclean-multi \
+	maintainer-clean-multi
+
+all-recursive: all-multi
+check-recursive: check-multi
+mostlyclean-recursive: mostlyclean-multi
+clean-recursive: clean-multi
+distclean-recursive: distclean-multi
+maintainer-clean-recursive: maintainer-clean-multi
+
+# The $(MAKE) comments below are to enable parallel building.
+all-multi:
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
+check-multi:
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=check multi-do # $(MAKE)
+mostlyclean-multi:
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
+clean-multi:
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
+distclean-multi:
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
+maintainer-clean-multi:
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
+
+MAKEOVERRIDES=
+
+# dejagnu support
+
+RUNTESTFLAGS=
+
+site.exp: Makefile
+	@echo 'Making a new site.exp file...'
+	@test ! -f site.bak || rm -f site.bak
+	@echo '## these variables are automatically generated by make ##' > $@-t
+	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
+	@echo '# edit the last section' >> $@-t
+	@echo 'set tool $(DEJATOOL)' >> $@-t
+	@echo 'set tool_version $(VERSION)' >> $@-t
+	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
+	@echo 'set objdir' `pwd` >> $@-t
+	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
+	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
+	@echo 'set host_alias $(build_alias)' >> $@-t
+	@echo 'set host_triplet $(build_triplet)' >> $@-t
+	@echo 'set target_alias $(host_alias)' >> $@-t
+	@echo 'set target_triplet $(host_triplet)' >> $@-t
+	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
+	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv $@-t site.exp
+
+check-DEJAGNU: site.exp
+	@if [ -d testsuite ] ; then \
+	  true ; \
+	else \
+	  mkdir testsuite ; \
+	fi
+	@rm -f testsuite/site.exp
+	@cp site.exp testsuite/site.exp
+	@rootme=`pwd` ; \
+	export rootme ; \
+	srcdir=`cd ${srcdir}; pwd` ; \
+	export srcdir ; \
+	EXPECT=`if [ -f $${rootme}/${MULTIBUILDTOP}../../expect/expect ] ; then \
+	          echo $${rootme}/${MULTIBUILDTOP}../../expect/expect ; \
+	        else \
+	          echo expect ; \
+	        fi` ; \
+	export EXPECT ; \
+	echo "Found expect: $${EXPECT}" ; \
+	if [ -f $(top_builddir)/$(MULTIBUILDTOP)../../expect/expect ] ; then \
+	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd` ; \
+	  export TCL_LIBRARY ; \
+	  echo "Found TCL library directory: $${TCL_LIBRARY}" ; \
+	fi ; \
+	RUNTEST=`if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+	           echo $${srcdir}/../dejagnu/runtest ; \
+	         else \
+	           echo runtest ; \
+	         fi` ; \
+	export RUNTEST ; \
+	echo "Found runtest: $${RUNTEST}" ; \
+	cd testsuite ; \
+	if $(SHELL) -c "$$RUNTEST --version" > /dev/null 2>&1 ; then \
+	   $$RUNTEST --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite $(RUNTESTFLAGS) ; \
+	   : ; \
+	else \
+	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
+	fi
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index 7458e6e18de..200eb0e5e8a 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -334,19 +334,19 @@ toollib_DATA = $(CRT0) $(CRT1)
 # both libc.a and libm.a.  We build them in libm.a and copy them over,
 # along with some required supporting routines.
 MATHOBJS_IN_LIBC = \
-	s_isinf.$(oext) sf_isinf.$(oext) \
-	s_isnan.$(oext) sf_isnan.$(oext) \
-	s_isinfd.$(oext) sf_isinff.$(oext) \
-	s_isnand.$(oext) sf_isnanf.$(oext) \
-	s_nan.$(oext) sf_nan.$(oext) \
-	s_ldexp.$(oext) sf_ldexp.$(oext) \
-	s_frexp.$(oext) sf_frexp.$(oext) \
-	s_modf.$(oext) \
-	sf_modf.$(oext) s_scalbn.$(oext) \
-	sf_scalbn.$(oext) \
-	s_finite.$(oext) sf_finite.$(oext) \
-	s_copysign.$(oext) sf_copysign.$(oext) \
-	s_infconst.$(oext)
+	$(lpfx)s_isinf.$(oext) $(lpfx)sf_isinf.$(oext) \
+	$(lpfx)s_isnan.$(oext) $(lpfx)sf_isnan.$(oext) \
+	$(lpfx)s_isinfd.$(oext) $(lpfx)sf_isinff.$(oext) \
+	$(lpfx)s_isnand.$(oext) $(lpfx)sf_isnanf.$(oext) \
+	$(lpfx)s_nan.$(oext) $(lpfx)sf_nan.$(oext) \
+	$(lpfx)s_ldexp.$(oext) $(lpfx)sf_ldexp.$(oext) \
+	$(lpfx)s_frexp.$(oext) $(lpfx)sf_frexp.$(oext) \
+	$(lpfx)s_modf.$(oext) \
+	$(lpfx)sf_modf.$(oext) $(lpfx)s_scalbn.$(oext) \
+	$(lpfx)sf_scalbn.$(oext) \
+	$(lpfx)s_finite.$(oext) $(lpfx)sf_finite.$(oext) \
+	$(lpfx)s_copysign.$(oext) $(lpfx)sf_copysign.$(oext) \
+	$(lpfx)s_infconst.$(oext)
 
 LIBC_OBJECTLISTS = \
 	$(POSIX_OBJECTLIST) \
diff --git a/newlib/libc/machine/a29k/Makefile.am b/newlib/libc/machine/a29k/Makefile.am
index 378c8ebc579..12b5114cd3c 100644
--- a/newlib/libc/machine/a29k/Makefile.am
+++ b/newlib/libc/machine/a29k/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/a29k/Makefile.in b/newlib/libc/machine/a29k/Makefile.in
index 50e63bb3a37..14cca3f39bf 100644
--- a/newlib/libc/machine/a29k/Makefile.in
+++ b/newlib/libc/machine/a29k/Makefile.in
@@ -179,7 +179,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = 
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 68c6a1870ea..c58be84f30f 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
index fcfd154e5b4..389c9f9fac9 100644
--- a/newlib/libc/machine/arm/Makefile.in
+++ b/newlib/libc/machine/arm/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S access.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
new file mode 100644
index 00000000000..de82dd18792
--- /dev/null
+++ b/newlib/libc/machine/cris/Makefile.am
@@ -0,0 +1,23 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+AM_CCASFLAGS = $(INCLUDES)
+
+noinst_LIBRARIES = lib.a
+
+# We also make a library with just the useful
+# machine-but-not-system-specific functions, usable as an add-on
+# by itself together with e.g. uclibc.
+toollib_LIBRARIES = libic.a
+
+lib_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
+
+libic_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
+tooldir = $(exec_prefix)/$(host_alias)
+toollibdir = $(tooldir)/lib$(MULTISUBDIR)
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/cris/Makefile.in b/newlib/libc/machine/cris/Makefile.in
index 027514702a3..fe429927093 100644
--- a/newlib/libc/machine/cris/Makefile.in
+++ b/newlib/libc/machine/cris/Makefile.in
@@ -195,6 +195,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 
 # We also make a library with just the useful
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
index 68234e8a24b..31a689d080a 100644
--- a/newlib/libc/machine/crx/Makefile.am
+++ b/newlib/libc/machine/crx/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/crx/Makefile.in b/newlib/libc/machine/crx/Makefile.in
index 8221ba08997..42178e7355f 100644
--- a/newlib/libc/machine/crx/Makefile.in
+++ b/newlib/libc/machine/crx/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S getenv.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/d10v/Makefile.am b/newlib/libc/machine/d10v/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/d10v/Makefile.am
+++ b/newlib/libc/machine/d10v/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/d10v/Makefile.in b/newlib/libc/machine/d10v/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/d10v/Makefile.in
+++ b/newlib/libc/machine/d10v/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/d30v/Makefile.am b/newlib/libc/machine/d30v/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/d30v/Makefile.am
+++ b/newlib/libc/machine/d30v/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/d30v/Makefile.in b/newlib/libc/machine/d30v/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/d30v/Makefile.in
+++ b/newlib/libc/machine/d30v/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/fr30/Makefile.am b/newlib/libc/machine/fr30/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/fr30/Makefile.am
+++ b/newlib/libc/machine/fr30/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/fr30/Makefile.in b/newlib/libc/machine/fr30/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/fr30/Makefile.in
+++ b/newlib/libc/machine/fr30/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/frv/Makefile.am
+++ b/newlib/libc/machine/frv/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/frv/Makefile.in b/newlib/libc/machine/frv/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/frv/Makefile.in
+++ b/newlib/libc/machine/frv/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index 51228f1918a..f3e5a7150a5 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/h8300/Makefile.in b/newlib/libc/machine/h8300/Makefile.in
index 8c21a76991c..d385f1ff73a 100644
--- a/newlib/libc/machine/h8300/Makefile.in
+++ b/newlib/libc/machine/h8300/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S \
 	setjmp.S h8sx_strcpy.S
diff --git a/newlib/libc/machine/h8500/Makefile.am b/newlib/libc/machine/h8500/Makefile.am
index 1afd31847cb..1c97cd7519b 100644
--- a/newlib/libc/machine/h8500/Makefile.am
+++ b/newlib/libc/machine/h8500/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/h8500/Makefile.in b/newlib/libc/machine/h8500/Makefile.in
index 4474360c6f2..18b1b67e6d5 100644
--- a/newlib/libc/machine/h8500/Makefile.in
+++ b/newlib/libc/machine/h8500/Makefile.in
@@ -184,7 +184,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = divsi3.c mulsi3.c divhi3.S shifts.c cmpsi.c psi.S setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/hppa/Makefile.am b/newlib/libc/machine/hppa/Makefile.am
index 1d4d8d0fe32..2d9647ca2a1 100644
--- a/newlib/libc/machine/hppa/Makefile.am
+++ b/newlib/libc/machine/hppa/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/hppa/Makefile.in b/newlib/libc/machine/hppa/Makefile.in
index ea8e8512784..06bf773d30e 100644
--- a/newlib/libc/machine/hppa/Makefile.in
+++ b/newlib/libc/machine/hppa/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	memchr.S memcmp.S memcpy.S memset.S setjmp.S strcat.S strcmp.S \
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 377a4019051..496c154e53b 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 if MACH_ADD_SETJMP
 mach_add_obj=setjmp.$(oext)
diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in
index 5914c077ad8..85338005c5a 100644
--- a/newlib/libc/machine/i386/Makefile.in
+++ b/newlib/libc/machine/i386/Makefile.in
@@ -214,7 +214,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 @MACH_ADD_SETJMP_FALSE@mach_add_obj = 
 @MACH_ADD_SETJMP_TRUE@mach_add_obj = setjmp.$(oext)
 LIB_SOURCES = \
diff --git a/newlib/libc/machine/i960/Makefile.am b/newlib/libc/machine/i960/Makefile.am
new file mode 100644
index 00000000000..12b5114cd3c
--- /dev/null
+++ b/newlib/libc/machine/i960/Makefile.am
@@ -0,0 +1,14 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+AM_CCASFLAGS = $(INCLUDES)
+
+noinst_LIBRARIES = lib.a
+
+lib_a_SOURCES =
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/i960/Makefile.in b/newlib/libc/machine/i960/Makefile.in
index f1a6dcc07ba..14cca3f39bf 100644
--- a/newlib/libc/machine/i960/Makefile.in
+++ b/newlib/libc/machine/i960/Makefile.in
@@ -179,6 +179,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = 
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ b/newlib/libc/machine/iq2000/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/iq2000/Makefile.in b/newlib/libc/machine/iq2000/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/iq2000/Makefile.in
+++ b/newlib/libc/machine/iq2000/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/m32c/Makefile.am
+++ b/newlib/libc/machine/m32c/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/m32c/Makefile.in b/newlib/libc/machine/m32c/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/m32c/Makefile.in
+++ b/newlib/libc/machine/m32c/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/m32r/Makefile.am b/newlib/libc/machine/m32r/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/m32r/Makefile.am
+++ b/newlib/libc/machine/m32r/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/m32r/Makefile.in b/newlib/libc/machine/m32r/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/m32r/Makefile.in
+++ b/newlib/libc/machine/m32r/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ b/newlib/libc/machine/m68hc11/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/m68hc11/Makefile.in b/newlib/libc/machine/m68hc11/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/m68hc11/Makefile.in
+++ b/newlib/libc/machine/m68hc11/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am
index e5282b79b69..0de088844a4 100644
--- a/newlib/libc/machine/m68k/Makefile.am
+++ b/newlib/libc/machine/m68k/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/m68k/Makefile.in b/newlib/libc/machine/m68k/Makefile.in
index 2922b0ee505..ae2fb2af5da 100644
--- a/newlib/libc/machine/m68k/Makefile.in
+++ b/newlib/libc/machine/m68k/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strcpy.c strlen.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/m88k/Makefile.am b/newlib/libc/machine/m88k/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/m88k/Makefile.am
+++ b/newlib/libc/machine/m88k/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/m88k/Makefile.in b/newlib/libc/machine/m88k/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/m88k/Makefile.in
+++ b/newlib/libc/machine/m88k/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index 5b05c2314fa..098a104b6f6 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/mips/Makefile.in b/newlib/libc/machine/mips/Makefile.in
index 56621a32a6c..a285ba64f56 100644
--- a/newlib/libc/machine/mips/Makefile.in
+++ b/newlib/libc/machine/mips/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S strlen.c strcmp.c strncpy.c memset.c memcpy.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/mn10200/Makefile.am b/newlib/libc/machine/mn10200/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/mn10200/Makefile.am
+++ b/newlib/libc/machine/mn10200/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/mn10200/Makefile.in b/newlib/libc/machine/mn10200/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/mn10200/Makefile.in
+++ b/newlib/libc/machine/mn10200/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/mn10300/Makefile.am b/newlib/libc/machine/mn10300/Makefile.am
index 29c0d9e210d..3b460a17f4e 100644
--- a/newlib/libc/machine/mn10300/Makefile.am
+++ b/newlib/libc/machine/mn10300/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/mn10300/Makefile.in b/newlib/libc/machine/mn10300/Makefile.in
index 61ab480ad7b..14880967ad4 100644
--- a/newlib/libc/machine/mn10300/Makefile.in
+++ b/newlib/libc/machine/mn10300/Makefile.in
@@ -184,7 +184,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S memchr.S memcmp.S memcpy.S memset.S strchr.S \
 	strcmp.S strcpy.S strlen.S
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/mt/Makefile.am
+++ b/newlib/libc/machine/mt/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/mt/Makefile.in b/newlib/libc/machine/mt/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/mt/Makefile.in
+++ b/newlib/libc/machine/mt/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/necv70/Makefile.am b/newlib/libc/machine/necv70/Makefile.am
index 0d5913ebccb..a43d773779d 100644
--- a/newlib/libc/machine/necv70/Makefile.am
+++ b/newlib/libc/machine/necv70/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/necv70/Makefile.in b/newlib/libc/machine/necv70/Makefile.in
index cc4a1828e42..5aab2374d06 100644
--- a/newlib/libc/machine/necv70/Makefile.in
+++ b/newlib/libc/machine/necv70/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = fastmath.s setjmp.s
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index 85d58bd9079..3c8b56b4bed 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
index 7a872a1a7ba..6f4b5e50862 100644
--- a/newlib/libc/machine/powerpc/Makefile.in
+++ b/newlib/libc/machine/powerpc/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S times.c
 lib_a_LIBADD = @extra_objs@
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index 77b39ce2fe5..d432ec33c53 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in
index 5fc0c92de74..11cd3a14f6b 100644
--- a/newlib/libc/machine/sh/Makefile.in
+++ b/newlib/libc/machine/sh/Makefile.in
@@ -195,7 +195,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 @SH64_FALSE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S
 @SH64_TRUE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S strncpy.S
diff --git a/newlib/libc/machine/sparc/Makefile.am b/newlib/libc/machine/sparc/Makefile.am
index c5c1d34da10..94a830ad610 100644
--- a/newlib/libc/machine/sparc/Makefile.am
+++ b/newlib/libc/machine/sparc/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/sparc/Makefile.in b/newlib/libc/machine/sparc/Makefile.in
index 492161177fc..ab148ef9875 100644
--- a/newlib/libc/machine/sparc/Makefile.in
+++ b/newlib/libc/machine/sparc/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = scan.c shuffle.c setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ b/newlib/libc/machine/tic4x/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/tic4x/Makefile.in b/newlib/libc/machine/tic4x/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/tic4x/Makefile.in
+++ b/newlib/libc/machine/tic4x/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/tic80/Makefile.am b/newlib/libc/machine/tic80/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/tic80/Makefile.am
+++ b/newlib/libc/machine/tic80/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/tic80/Makefile.in b/newlib/libc/machine/tic80/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/tic80/Makefile.in
+++ b/newlib/libc/machine/tic80/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/v850/Makefile.am b/newlib/libc/machine/v850/Makefile.am
index 4e46b4cb94c..e06be907d0d 100644
--- a/newlib/libc/machine/v850/Makefile.am
+++ b/newlib/libc/machine/v850/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/v850/Makefile.in b/newlib/libc/machine/v850/Makefile.in
index fe9ad9e2a6c..353a4be4309 100644
--- a/newlib/libc/machine/v850/Makefile.in
+++ b/newlib/libc/machine/v850/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index 061488bcae4..2e784ec389c 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/w65/Makefile.in b/newlib/libc/machine/w65/Makefile.in
index 5b93c3ead6f..3fc64fa775e 100644
--- a/newlib/libc/machine/w65/Makefile.in
+++ b/newlib/libc/machine/w65/Makefile.in
@@ -184,7 +184,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = udivhi3.s umodhi3.s smulhi3.s lshrhi.s sdivhi3.s mulsi3.c \
 	divsi3.c cmpsi.c
diff --git a/newlib/libc/machine/xscale/Makefile.am b/newlib/libc/machine/xscale/Makefile.am
index c3d19b5e7a5..62c056c2d7c 100644
--- a/newlib/libc/machine/xscale/Makefile.am
+++ b/newlib/libc/machine/xscale/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/xscale/Makefile.in b/newlib/libc/machine/xscale/Makefile.in
index ca853ccc027..c24eff4a001 100644
--- a/newlib/libc/machine/xscale/Makefile.in
+++ b/newlib/libc/machine/xscale/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	memchr.c memcmp.c memcpy.c memmove.c memset.c \
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
index e36c56f1c05..157daa8f79b 100644
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ b/newlib/libc/machine/xstormy16/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = cygnus
 # to output a definition for newlib_basedir.
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/xstormy16/Makefile.in b/newlib/libc/machine/xstormy16/Makefile.in
index 806b018198b..66b57501d72 100644
--- a/newlib/libc/machine/xstormy16/Makefile.in
+++ b/newlib/libc/machine/xstormy16/Makefile.in
@@ -187,7 +187,7 @@ AUTOMAKE_OPTIONS = cygnus
 # hack: putting $(newlib_basedir)/libm/common into INCLUDES forces automake
 # to output a definition for newlib_basedir.
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index b1a34dba886..d89075e819d 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/machine/z8k/Makefile.in b/newlib/libc/machine/z8k/Makefile.in
index 4ded1c0ef38..f071e116d7a 100644
--- a/newlib/libc/machine/z8k/Makefile.in
+++ b/newlib/libc/machine/z8k/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = setjmp.S memset.S memcpy.S memmove.S memcmp.S
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index 682a89c83a6..1f01b33b475 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/a29khif/Makefile.in b/newlib/libc/sys/a29khif/Makefile.in
index 7c6d1444c2a..7f24a926e81 100644
--- a/newlib/libc/sys/a29khif/Makefile.in
+++ b/newlib/libc/sys/a29khif/Makefile.in
@@ -192,7 +192,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	_alloc.s	\
diff --git a/newlib/libc/sys/arc/Makefile.am b/newlib/libc/sys/arc/Makefile.am
index 6cfa2c26163..be3a99b8d37 100644
--- a/newlib/libc/sys/arc/Makefile.am
+++ b/newlib/libc/sys/arc/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/arc/Makefile.in b/newlib/libc/sys/arc/Makefile.in
index 5fd2715e9d2..5671dc7dbe4 100644
--- a/newlib/libc/sys/arc/Makefile.in
+++ b/newlib/libc/sys/arc/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = isatty.c mem-layout.c sbrk.c syscalls.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 14db28496b2..9161407dc43 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in
index e15fef3eade..6690e6aa337 100644
--- a/newlib/libc/sys/arm/Makefile.in
+++ b/newlib/libc/sys/arm/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 @MAY_SUPPLY_SYSCALLS_FALSE@extra_objs = 
 @MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = libcfunc.o trap.o syscalls.o
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index ee55087864b..e55339a2112 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/d10v/Makefile.in b/newlib/libc/sys/d10v/Makefile.in
index 4ea053e75f4..77483343616 100644
--- a/newlib/libc/sys/d10v/Makefile.in
+++ b/newlib/libc/sys/d10v/Makefile.in
@@ -182,7 +182,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c trap.S creat.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
index 43a68bc20ae..dc5ca42f929 100644
--- a/newlib/libc/sys/decstation/Makefile.am
+++ b/newlib/libc/sys/decstation/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/decstation/Makefile.in b/newlib/libc/sys/decstation/Makefile.in
index 26d4b0e015e..d4215044975 100644
--- a/newlib/libc/sys/decstation/Makefile.in
+++ b/newlib/libc/sys/decstation/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 COPYOFILES = \
 	read.o \
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index e2a1217cb2b..2062199d567 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/h8300hms/Makefile.in b/newlib/libc/sys/h8300hms/Makefile.in
index 2f9d529d1a7..b3f2afa7819 100644
--- a/newlib/libc/sys/h8300hms/Makefile.in
+++ b/newlib/libc/sys/h8300hms/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
 	close.S fstat.S lseek.S open.S read.S stat.S write.S
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 9365a3c0d70..45b83f10bed 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/h8500hms/Makefile.in b/newlib/libc/sys/h8500hms/Makefile.in
index 7e886fcaab4..a24fe556dbc 100644
--- a/newlib/libc/sys/h8500hms/Makefile.in
+++ b/newlib/libc/sys/h8500hms/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c misc.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.am b/newlib/libc/sys/linux/machine/i386/Makefile.am
index 94a2688a055..9cf5763dba8 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.am
@@ -19,7 +19,7 @@ else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_CCASFLAGS = $(AM_CCASFLAGS) $(AM_CFLAGS)
+lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 noinst_DATA =
 endif # USE_LIBTOOL
 
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.in b/newlib/libc/sys/linux/machine/i386/Makefile.in
index 914e7d6af67..6c87bcdcaaa 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.in
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.in
@@ -230,7 +230,7 @@ AM_CCASFLAGS = -I$(srcdir)/../.. $(INCLUDES)
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
 @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS)
-@USE_LIBTOOL_FALSE@lib_a_CCASFLAGS = $(AM_CCASFLAGS) $(AM_CFLAGS)
+@USE_LIBTOOL_FALSE@lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 ACLOCAL_AMFLAGS = -I ../../../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 all: all-am
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index a56994e6d96..91fec69f9c2 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/m88kbug/Makefile.in b/newlib/libc/sys/m88kbug/Makefile.in
index 789805dcbb5..2fcf5b946cd 100644
--- a/newlib/libc/sys/m88kbug/Makefile.in
+++ b/newlib/libc/sys/m88kbug/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 9ad93da8fb9..7a421f5a76d 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/mmixware/Makefile.in b/newlib/libc/sys/mmixware/Makefile.in
index cbc74e7ca8d..84cb62c5816 100644
--- a/newlib/libc/sys/mmixware/Makefile.in
+++ b/newlib/libc/sys/mmixware/Makefile.in
@@ -190,7 +190,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index 3eda0fb7f4e..74c72160c11 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/netware/Makefile.in b/newlib/libc/sys/netware/Makefile.in
index d2d14a29511..c637c8625e6 100644
--- a/newlib/libc/sys/netware/Makefile.in
+++ b/newlib/libc/sys/netware/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	getpid.c \
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 561137b7e07..028556d29a5 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in
index 2992e4d6022..ba15e687712 100644
--- a/newlib/libc/sys/rdos/Makefile.in
+++ b/newlib/libc/sys/rdos/Makefile.in
@@ -189,7 +189,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
 	getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index e88958f7f1c..dc08b82113f 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/rtems/Makefile.in b/newlib/libc/sys/rtems/Makefile.in
index 035ff756fc0..61532c70382 100644
--- a/newlib/libc/sys/rtems/Makefile.in
+++ b/newlib/libc/sys/rtems/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = dummysys.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 44095bde208..0e3bf7c72a8 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sh/Makefile.in b/newlib/libc/sys/sh/Makefile.in
index 2f9d68255b8..d81d97c9765 100644
--- a/newlib/libc/sys/sh/Makefile.in
+++ b/newlib/libc/sys/sh/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
index 2aff65d891b..5bf6f762de3 100644
--- a/newlib/libc/sys/sparc64/Makefile.am
+++ b/newlib/libc/sys/sparc64/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sparc64/Makefile.in b/newlib/libc/sys/sparc64/Makefile.in
index 95652aaa9c4..894361d03b4 100644
--- a/newlib/libc/sys/sparc64/Makefile.in
+++ b/newlib/libc/sys/sparc64/Makefile.in
@@ -205,7 +205,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 
 # _r.o is for the reentrant syscall stubs.
diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
new file mode 100644
index 00000000000..227813adf87
--- /dev/null
+++ b/newlib/libc/sys/sun4/Makefile.am
@@ -0,0 +1,97 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+AM_CCASFLAGS = $(INCLUDES)
+
+noinst_LIBRARIES = lib.a
+
+COPYOFILES = \
+	Ovfork.o \
+	_exit.o \
+	_sigvec.o \
+	abort.o \
+	access.o \
+	cerror.o \
+	chmod.o \
+	chown.o \
+	close.o \
+	creat.o \
+	dup.o \
+	dup2.o \
+	errlst.o \
+	execl.o \
+	execle.o \
+	execv.o \
+	execve.o \
+	execvp.o \
+	fork.o \
+	fstat.o \
+	getdtablesize.o \
+	getpid.o \
+	getrusage.o  \
+	gettimeofday.o \
+	ieee_globals.o \
+	ioctl.o \
+	isatty.o \
+	kill.o \
+	link.o \
+	lseek.o \
+	open.o \
+	pipe.o \
+	popen.o \
+	read.o \
+	sbrk.o \
+	setitimer.o \
+	sigblock.o \
+	signal.o \
+	sigpause.o \
+	sigsetjmp.o \
+	sigsetmask.o \
+	sigtramp.o \
+	sigvec.o \
+	sleep.o \
+	start_float.o \
+	stat.o \
+	time.o \
+	times.o \
+	umask.o \
+	unlink.o \
+	utime.o \
+	utimes.o \
+	wait.o \
+	wait3.o \
+	wait4.o \
+	write.o \
+	rem.o \
+	multiply.o \
+	umultiply.o
+
+# These files are from Sun's libc.a, but the must be renamed because they
+# conflict with other library .o's.  They are renamed to xxxS.o.
+COPYRENAMEOFILES = divS.o
+
+COPYOMFILES = ieee_flags.o
+
+lib_a_SOURCES = _main.c ieee.c
+lib_a_LIBADD = $(COPYOFILES) $(COPYOMFILES) $(COPYRENAMEOFILES)
+
+$(COPYOFILES):
+	$(AR) x /lib/libc.a $(COPYOFILES) 
+
+$(COPYRENAMEOFILES):
+	$(AR) x /lib/libc.a $(COPYRENAMEFILES:S.o=.o)
+	for f in $(COPYRENAMEOFILES); do mv `basename $$f S.o`.o $$f; done
+
+$(COPYOMFILES):
+	$(AR) x /lib/libm.a $(COPYOMFILES) 
+
+all: crt0.o
+
+crt0.o:
+	cp /lib/crt0.o crt0.o
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sun4/Makefile.in b/newlib/libc/sys/sun4/Makefile.in
index 8c2cec457ef..76e2b1188f1 100644
--- a/newlib/libc/sys/sun4/Makefile.in
+++ b/newlib/libc/sys/sun4/Makefile.in
@@ -194,6 +194,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 COPYOFILES = \
 	Ovfork.o \
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index bf519a4f81f..8b5fba6d29d 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sysmec/Makefile.in b/newlib/libc/sys/sysmec/Makefile.in
index 624bcad5aad..385b3fcef25 100644
--- a/newlib/libc/sys/sysmec/Makefile.in
+++ b/newlib/libc/sys/sysmec/Makefile.in
@@ -189,7 +189,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index 0dd92ab39a2..34d03d34d9e 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sysnec810/Makefile.in b/newlib/libc/sys/sysnec810/Makefile.in
index 3b602954be8..d844cb625ca 100644
--- a/newlib/libc/sys/sysnec810/Makefile.in
+++ b/newlib/libc/sys/sysnec810/Makefile.in
@@ -183,7 +183,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = io.s write.c sbrk.c misc.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index 8edc97105cf..d76e4b5a7b3 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sysnecv850/Makefile.in b/newlib/libc/sys/sysnecv850/Makefile.in
index 514ba818745..ad29316beec 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.in
+++ b/newlib/libc/sys/sysnecv850/Makefile.in
@@ -190,7 +190,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	_exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index b5d3a33ec79..564da337cd3 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sysvi386/Makefile.in b/newlib/libc/sys/sysvi386/Makefile.in
index a4a7d6fe6ca..11bf8a86136 100644
--- a/newlib/libc/sys/sysvi386/Makefile.in
+++ b/newlib/libc/sys/sysvi386/Makefile.in
@@ -201,7 +201,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = \
 	ioctl.s isatty.c read.s lseek.s close.s sbrk.c fstat.s cerror.s \
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index fde1c77de80..14e70b37165 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.in b/newlib/libc/sys/sysvnecv70/Makefile.in
index e6c15af0225..54ce7288070 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.in
+++ b/newlib/libc/sys/sysvnecv70/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ioctl.s isatty.s read.s lseek.s close.s sbrk.s fstat.s \
 	cerror.s exit.s write.s sysv60.s fpx.c fps.s open.s
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index 91d18497e96..73a733f9b5c 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/tic80/Makefile.in b/newlib/libc/sys/tic80/Makefile.in
index 2de188952ca..330e908bada 100644
--- a/newlib/libc/sys/tic80/Makefile.in
+++ b/newlib/libc/sys/tic80/Makefile.in
@@ -185,7 +185,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = 
 
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index 8fa4d42f92a..f1f686d82ae 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/w65/Makefile.in b/newlib/libc/sys/w65/Makefile.in
index ad478692d87..e75325f609c 100644
--- a/newlib/libc/sys/w65/Makefile.in
+++ b/newlib/libc/sys/w65/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = syscalls.c trap.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index 5d4030a9a53..f51e540dea2 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 
 noinst_LIBRARIES = lib.a
 
diff --git a/newlib/libc/sys/z8ksim/Makefile.in b/newlib/libc/sys/z8ksim/Makefile.in
index e99437186f9..4119957717f 100644
--- a/newlib/libc/sys/z8ksim/Makefile.in
+++ b/newlib/libc/sys/z8ksim/Makefile.in
@@ -181,7 +181,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-AM_CCASFLAGS = $(AM_CCASFLAGS) $(INCLUDES)
+AM_CCASFLAGS = $(INCLUDES)
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = glue.c
 ACLOCAL_AMFLAGS = -I ../../..
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index 74a5a7af80b..b2b2b6c7fcc 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
+AM_CCASFLAGS = $(INCLUDES)
+
 LIB_SOURCES = \
 	f_atan2.S f_atan2f.S f_exp.c f_expf.c \
 	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
diff --git a/newlib/libm/machine/i386/Makefile.in b/newlib/libm/machine/i386/Makefile.in
index fdbedc33bfd..cea5e653c30 100644
--- a/newlib/libm/machine/i386/Makefile.in
+++ b/newlib/libm/machine/i386/Makefile.in
@@ -219,6 +219,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CCASFLAGS = $(INCLUDES)
 LIB_SOURCES = \
 	f_atan2.S f_atan2f.S f_exp.c f_expf.c \
 	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \