[PATCH] newlib/libgloss: drop unused $(CROSS_CFLAGS)
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
This is used in a bunch of places, but nowhere is it ever set, and
nowhere can I find any documentation, nor can I find any other project
using it. So delete the flags to simplify.
---
libgloss/Makefile.am | 1 -
libgloss/Makefile.in | 1 -
libgloss/sparc/libsys/Makefile.in | 8 ++++----
libgloss/testsuite/Makefile.in | 1 -
newlib/libc/argz/Makefile.am | 2 +-
newlib/libc/argz/Makefile.in | 2 +-
newlib/libc/ctype/Makefile.am | 2 +-
newlib/libc/ctype/Makefile.in | 2 +-
newlib/libc/errno/Makefile.am | 2 +-
newlib/libc/errno/Makefile.in | 2 +-
newlib/libc/iconv/Makefile.am | 2 +-
newlib/libc/iconv/Makefile.in | 2 +-
newlib/libc/iconv/ccs/Makefile.am | 2 +-
newlib/libc/iconv/ccs/Makefile.in | 2 +-
newlib/libc/iconv/ces/Makefile.am | 2 +-
newlib/libc/iconv/ces/Makefile.in | 2 +-
newlib/libc/iconv/lib/Makefile.am | 2 +-
newlib/libc/iconv/lib/Makefile.in | 2 +-
newlib/libc/locale/Makefile.am | 2 +-
newlib/libc/locale/Makefile.in | 2 +-
newlib/libc/machine/a29k/Makefile.am | 2 +-
newlib/libc/machine/a29k/Makefile.in | 2 +-
newlib/libc/machine/aarch64/Makefile.am | 2 +-
newlib/libc/machine/aarch64/Makefile.in | 2 +-
newlib/libc/machine/amdgcn/Makefile.am | 2 +-
newlib/libc/machine/amdgcn/Makefile.in | 2 +-
newlib/libc/machine/arc/Makefile.am | 2 +-
newlib/libc/machine/arc/Makefile.in | 2 +-
newlib/libc/machine/arm/Makefile.am | 2 +-
newlib/libc/machine/arm/Makefile.in | 2 +-
newlib/libc/machine/bfin/Makefile.am | 2 +-
newlib/libc/machine/bfin/Makefile.in | 2 +-
newlib/libc/machine/cr16/Makefile.am | 2 +-
newlib/libc/machine/cr16/Makefile.in | 2 +-
newlib/libc/machine/cris/Makefile.am | 2 +-
newlib/libc/machine/cris/Makefile.in | 2 +-
newlib/libc/machine/crx/Makefile.am | 2 +-
newlib/libc/machine/crx/Makefile.in | 2 +-
newlib/libc/machine/csky/Makefile.am | 2 +-
newlib/libc/machine/csky/Makefile.in | 2 +-
newlib/libc/machine/d10v/Makefile.am | 2 +-
newlib/libc/machine/d10v/Makefile.in | 2 +-
newlib/libc/machine/d30v/Makefile.am | 2 +-
newlib/libc/machine/d30v/Makefile.in | 2 +-
newlib/libc/machine/epiphany/Makefile.am | 2 +-
newlib/libc/machine/epiphany/Makefile.in | 2 +-
newlib/libc/machine/fr30/Makefile.am | 2 +-
newlib/libc/machine/fr30/Makefile.in | 2 +-
newlib/libc/machine/frv/Makefile.am | 2 +-
newlib/libc/machine/frv/Makefile.in | 2 +-
newlib/libc/machine/ft32/Makefile.am | 2 +-
newlib/libc/machine/ft32/Makefile.in | 2 +-
newlib/libc/machine/h8300/Makefile.am | 2 +-
newlib/libc/machine/h8300/Makefile.in | 2 +-
newlib/libc/machine/h8500/Makefile.am | 2 +-
newlib/libc/machine/h8500/Makefile.in | 2 +-
newlib/libc/machine/hppa/Makefile.am | 2 +-
newlib/libc/machine/hppa/Makefile.in | 2 +-
newlib/libc/machine/i386/Makefile.am | 2 +-
newlib/libc/machine/i386/Makefile.in | 2 +-
newlib/libc/machine/i960/Makefile.am | 2 +-
newlib/libc/machine/i960/Makefile.in | 2 +-
newlib/libc/machine/iq2000/Makefile.am | 2 +-
newlib/libc/machine/iq2000/Makefile.in | 2 +-
newlib/libc/machine/lm32/Makefile.am | 2 +-
newlib/libc/machine/lm32/Makefile.in | 2 +-
newlib/libc/machine/m32c/Makefile.am | 2 +-
newlib/libc/machine/m32c/Makefile.in | 2 +-
newlib/libc/machine/m32r/Makefile.am | 2 +-
newlib/libc/machine/m32r/Makefile.in | 2 +-
newlib/libc/machine/m68hc11/Makefile.am | 2 +-
newlib/libc/machine/m68hc11/Makefile.in | 2 +-
newlib/libc/machine/m68k/Makefile.am | 2 +-
newlib/libc/machine/m68k/Makefile.in | 2 +-
newlib/libc/machine/m88k/Makefile.am | 2 +-
newlib/libc/machine/m88k/Makefile.in | 2 +-
newlib/libc/machine/mep/Makefile.am | 2 +-
newlib/libc/machine/mep/Makefile.in | 2 +-
newlib/libc/machine/microblaze/Makefile.am | 2 +-
newlib/libc/machine/microblaze/Makefile.in | 2 +-
newlib/libc/machine/mips/Makefile.am | 2 +-
newlib/libc/machine/mips/Makefile.in | 2 +-
newlib/libc/machine/mn10200/Makefile.am | 2 +-
newlib/libc/machine/mn10200/Makefile.in | 2 +-
newlib/libc/machine/mn10300/Makefile.am | 2 +-
newlib/libc/machine/mn10300/Makefile.in | 2 +-
newlib/libc/machine/moxie/Makefile.am | 2 +-
newlib/libc/machine/moxie/Makefile.in | 2 +-
newlib/libc/machine/msp430/Makefile.am | 2 +-
newlib/libc/machine/msp430/Makefile.in | 2 +-
newlib/libc/machine/mt/Makefile.am | 2 +-
newlib/libc/machine/mt/Makefile.in | 2 +-
newlib/libc/machine/nds32/Makefile.am | 2 +-
newlib/libc/machine/nds32/Makefile.in | 2 +-
newlib/libc/machine/necv70/Makefile.am | 2 +-
newlib/libc/machine/necv70/Makefile.in | 2 +-
newlib/libc/machine/nios2/Makefile.am | 2 +-
newlib/libc/machine/nios2/Makefile.in | 2 +-
newlib/libc/machine/nvptx/Makefile.am | 2 +-
newlib/libc/machine/nvptx/Makefile.in | 2 +-
newlib/libc/machine/or1k/Makefile.am | 2 +-
newlib/libc/machine/or1k/Makefile.in | 2 +-
newlib/libc/machine/powerpc/Makefile.am | 2 +-
newlib/libc/machine/powerpc/Makefile.in | 2 +-
newlib/libc/machine/pru/Makefile.am | 2 +-
newlib/libc/machine/pru/Makefile.in | 2 +-
newlib/libc/machine/riscv/Makefile.am | 2 +-
newlib/libc/machine/riscv/Makefile.in | 2 +-
newlib/libc/machine/rl78/Makefile.am | 2 +-
newlib/libc/machine/rl78/Makefile.in | 2 +-
newlib/libc/machine/rx/Makefile.am | 2 +-
newlib/libc/machine/rx/Makefile.in | 2 +-
newlib/libc/machine/sh/Makefile.am | 2 +-
newlib/libc/machine/sh/Makefile.in | 2 +-
newlib/libc/machine/sparc/Makefile.am | 2 +-
newlib/libc/machine/sparc/Makefile.in | 2 +-
newlib/libc/machine/spu/Makefile.am | 2 +-
newlib/libc/machine/spu/Makefile.in | 2 +-
newlib/libc/machine/tic4x/Makefile.am | 2 +-
newlib/libc/machine/tic4x/Makefile.in | 2 +-
newlib/libc/machine/tic6x/Makefile.am | 2 +-
newlib/libc/machine/tic6x/Makefile.in | 2 +-
newlib/libc/machine/tic80/Makefile.am | 2 +-
newlib/libc/machine/tic80/Makefile.in | 2 +-
newlib/libc/machine/v850/Makefile.am | 2 +-
newlib/libc/machine/v850/Makefile.in | 2 +-
newlib/libc/machine/visium/Makefile.am | 2 +-
newlib/libc/machine/visium/Makefile.in | 2 +-
newlib/libc/machine/w65/Makefile.am | 2 +-
newlib/libc/machine/w65/Makefile.in | 2 +-
newlib/libc/machine/x86_64/Makefile.am | 2 +-
newlib/libc/machine/x86_64/Makefile.in | 2 +-
newlib/libc/machine/xc16x/Makefile.am | 2 +-
newlib/libc/machine/xc16x/Makefile.in | 2 +-
newlib/libc/machine/xstormy16/Makefile.am | 2 +-
newlib/libc/machine/xstormy16/Makefile.in | 2 +-
newlib/libc/machine/z8k/Makefile.am | 2 +-
newlib/libc/machine/z8k/Makefile.in | 2 +-
newlib/libc/misc/Makefile.am | 2 +-
newlib/libc/misc/Makefile.in | 2 +-
newlib/libc/posix/Makefile.am | 2 +-
newlib/libc/posix/Makefile.in | 2 +-
newlib/libc/reent/Makefile.am | 2 +-
newlib/libc/reent/Makefile.in | 2 +-
newlib/libc/search/Makefile.am | 2 +-
newlib/libc/search/Makefile.in | 2 +-
newlib/libc/signal/Makefile.am | 2 +-
newlib/libc/signal/Makefile.in | 2 +-
newlib/libc/ssp/Makefile.am | 2 +-
newlib/libc/ssp/Makefile.in | 2 +-
newlib/libc/stdio/Makefile.am | 2 +-
newlib/libc/stdio/Makefile.in | 2 +-
newlib/libc/stdio64/Makefile.am | 2 +-
newlib/libc/stdio64/Makefile.in | 2 +-
newlib/libc/stdlib/Makefile.am | 2 +-
newlib/libc/stdlib/Makefile.in | 2 +-
newlib/libc/string/Makefile.am | 2 +-
newlib/libc/string/Makefile.in | 2 +-
newlib/libc/sys/a29khif/Makefile.am | 2 +-
newlib/libc/sys/a29khif/Makefile.in | 2 +-
newlib/libc/sys/amdgcn/Makefile.am | 2 +-
newlib/libc/sys/amdgcn/Makefile.in | 2 +-
newlib/libc/sys/arm/Makefile.am | 2 +-
newlib/libc/sys/arm/Makefile.in | 2 +-
newlib/libc/sys/d10v/Makefile.am | 2 +-
newlib/libc/sys/d10v/Makefile.in | 2 +-
newlib/libc/sys/epiphany/Makefile.am | 2 +-
newlib/libc/sys/epiphany/Makefile.in | 2 +-
newlib/libc/sys/h8300hms/Makefile.am | 2 +-
newlib/libc/sys/h8300hms/Makefile.in | 2 +-
newlib/libc/sys/h8500hms/Makefile.am | 2 +-
newlib/libc/sys/h8500hms/Makefile.in | 2 +-
newlib/libc/sys/m88kbug/Makefile.am | 2 +-
newlib/libc/sys/m88kbug/Makefile.in | 2 +-
newlib/libc/sys/mmixware/Makefile.am | 2 +-
newlib/libc/sys/mmixware/Makefile.in | 2 +-
newlib/libc/sys/netware/Makefile.am | 2 +-
newlib/libc/sys/netware/Makefile.in | 2 +-
newlib/libc/sys/or1k/Makefile.am | 2 +-
newlib/libc/sys/or1k/Makefile.in | 2 +-
newlib/libc/sys/phoenix/Makefile.am | 2 +-
newlib/libc/sys/phoenix/Makefile.in | 2 +-
newlib/libc/sys/phoenix/machine/arm/Makefile.am | 2 +-
newlib/libc/sys/phoenix/machine/arm/Makefile.in | 2 +-
newlib/libc/sys/rdos/Makefile.am | 2 +-
newlib/libc/sys/rdos/Makefile.in | 2 +-
newlib/libc/sys/rtems/Makefile.am | 2 +-
newlib/libc/sys/rtems/Makefile.in | 2 +-
newlib/libc/sys/sh/Makefile.am | 2 +-
newlib/libc/sys/sh/Makefile.in | 2 +-
newlib/libc/sys/sysmec/Makefile.am | 2 +-
newlib/libc/sys/sysmec/Makefile.in | 2 +-
newlib/libc/sys/sysnec810/Makefile.am | 2 +-
newlib/libc/sys/sysnec810/Makefile.in | 2 +-
newlib/libc/sys/sysnecv850/Makefile.am | 2 +-
newlib/libc/sys/sysnecv850/Makefile.in | 2 +-
newlib/libc/sys/sysvi386/Makefile.am | 2 +-
newlib/libc/sys/sysvi386/Makefile.in | 2 +-
newlib/libc/sys/sysvnecv70/Makefile.am | 2 +-
newlib/libc/sys/sysvnecv70/Makefile.in | 2 +-
newlib/libc/sys/tic80/Makefile.am | 2 +-
newlib/libc/sys/tic80/Makefile.in | 2 +-
newlib/libc/sys/tirtos/Makefile.am | 2 +-
newlib/libc/sys/tirtos/Makefile.in | 2 +-
newlib/libc/sys/w65/Makefile.am | 2 +-
newlib/libc/sys/w65/Makefile.in | 2 +-
newlib/libc/sys/z8ksim/Makefile.am | 2 +-
newlib/libc/sys/z8ksim/Makefile.in | 2 +-
newlib/libc/syscalls/Makefile.am | 2 +-
newlib/libc/syscalls/Makefile.in | 2 +-
newlib/libc/time/Makefile.am | 2 +-
newlib/libc/time/Makefile.in | 2 +-
newlib/libc/unix/Makefile.am | 2 +-
newlib/libc/unix/Makefile.in | 2 +-
newlib/libc/xdr/Makefile.am | 2 +-
newlib/libc/xdr/Makefile.in | 2 +-
newlib/libm/common/Makefile.am | 2 +-
newlib/libm/common/Makefile.in | 2 +-
newlib/libm/complex/Makefile.am | 2 +-
newlib/libm/complex/Makefile.in | 2 +-
newlib/libm/fenv/Makefile.am | 2 +-
newlib/libm/fenv/Makefile.in | 2 +-
newlib/libm/machine/aarch64/Makefile.am | 3 +--
newlib/libm/machine/aarch64/Makefile.in | 4 +---
newlib/libm/machine/arm/Makefile.am | 3 +--
newlib/libm/machine/arm/Makefile.in | 4 +---
newlib/libm/machine/i386/Makefile.am | 2 +-
newlib/libm/machine/i386/Makefile.in | 2 +-
newlib/libm/machine/mips/Makefile.am | 3 +--
newlib/libm/machine/mips/Makefile.in | 4 +---
newlib/libm/machine/nds32/Makefile.am | 3 +--
newlib/libm/machine/nds32/Makefile.in | 4 +---
newlib/libm/machine/powerpc/Makefile.am | 3 +--
newlib/libm/machine/powerpc/Makefile.in | 4 +---
newlib/libm/machine/pru/Makefile.am | 3 +--
newlib/libm/machine/pru/Makefile.in | 4 +---
newlib/libm/machine/riscv/Makefile.am | 3 +--
newlib/libm/machine/riscv/Makefile.in | 4 +---
newlib/libm/machine/sparc/Makefile.am | 3 +--
newlib/libm/machine/sparc/Makefile.in | 4 +---
newlib/libm/machine/spu/Makefile.am | 3 +--
newlib/libm/machine/spu/Makefile.in | 4 +---
newlib/libm/machine/x86_64/Makefile.am | 3 +--
newlib/libm/machine/x86_64/Makefile.in | 4 +---
newlib/libm/math/Makefile.am | 2 +-
newlib/libm/math/Makefile.in | 2 +-
newlib/libm/mathfp/Makefile.am | 2 +-
newlib/libm/mathfp/Makefile.in | 2 +-
248 files changed, 248 insertions(+), 281 deletions(-)
diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index b180309ca238..6f2377f54d1a 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -39,7 +39,6 @@ FLAGS_TO_PASS = \
"MAKEINFO=$(MAKEINFO)" \
"AS=$(AS)" \
"LD=$(LD)" \
- "CROSS_CFLAGS=$(CROSS_CFLAGS)" \
"TARGET_CFLAGS=$(TARGET_CFLAGS)" \
"exec_prefix=$(exec_prefix)" \
"prefix=$(prefix)" \
diff --git a/libgloss/sparc/libsys/Makefile.in b/libgloss/sparc/libsys/Makefile.in
index b732137c5f08..c6c2bc300d4d 100644
--- a/libgloss/sparc/libsys/Makefile.in
+++ b/libgloss/sparc/libsys/Makefile.in
@@ -50,9 +50,9 @@ RANLIB = @RANLIB@
.SUFFIXES: .c .S .o _r.o
.S_r.o:
- $(CC) $(CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) -DREENT $(INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) -DREENT $(INCLUDES) -c $< -o $@
.c_r.o:
- $(CC) $(CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) -DREENT $(INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) -DREENT $(INCLUDES) -c $< -o $@
# CFILES_R, SFILES_R, and TEMPLATE_SFILES_R define those system calls that are
# needed by the ANSI C part of newlib when REENTRANT_SYSCALLS_PROVIDED is
@@ -118,13 +118,13 @@ stamp-srcs: Makefile template.S template_r.S
for f in $(TEMPLATE_SFILES:_=) ; \
do \
$(CC) -E -Dfunc=$$f \
- $(CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) $(INCLUDES) \
+ $(CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) $(INCLUDES) \
$(srcdir)/template.S >$$f.S ; \
done
for f in $(TEMPLATE_SFILES_R:_=) ; \
do \
$(CC) -E -Dfunc=$$f \
- $(CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) $(INCLUDES) \
+ $(CFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS) $(INCLUDES) \
$(srcdir)/template_r.S | sed -e 's/^_/#/' >$$f.S ; \
done
touch stamp-srcs
diff --git a/libgloss/testsuite/Makefile.in b/libgloss/testsuite/Makefile.in
index 28fd9143edb8..8d465aa03e9b 100644
--- a/libgloss/testsuite/Makefile.in
+++ b/libgloss/testsuite/Makefile.in
@@ -57,7 +57,6 @@ FLAGS_TO_PASS = \
"RANLIB=$(RANLIB)" \
"AR_FLAGS=$(AR_FLAGS)" \
"AS=$(AS)" \
- "CROSS_CFLAGS=$(CROSS_CFLAGS)" \
"TARGET_CFLAGS=$(TARGET_CFLAGS)" \
"OBJROOT=$(OBJROOT)"
diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am
index 7c1c1ba810bf..27cabd7e4546 100644
--- a/newlib/libc/argz/Makefile.am
+++ b/newlib/libc/argz/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
## All functions in this directory are EL/IX level 2 and above
if ELIX_LEVEL_1
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 5c4269f7e847..dac01fa48fa0 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
ctype_.c \
diff --git a/newlib/libc/errno/Makefile.am b/newlib/libc/errno/Makefile.am
index edb21e8633d7..190b389021dd 100644
--- a/newlib/libc/errno/Makefile.am
+++ b/newlib/libc/errno/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = errno.c
diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am
index 411c233ccde2..bfaf0dd9e0d9 100644
--- a/newlib/libc/iconv/Makefile.am
+++ b/newlib/libc/iconv/Makefile.am
@@ -4,4 +4,4 @@ SUBDIRS = ces ccs lib .
cctdir=$(datadir)/iconv_data
cct_DATA=encoding.aliases
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index 3dfa9cbe88a0..fb3b51c79105 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = ccsbi.c \
iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
index 632550be82c4..f59401305741 100644
--- a/newlib/libc/iconv/ces/Makefile.am
+++ b/newlib/libc/iconv/ces/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
utf-8.c \
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
index 6d9fc835439d..c385538df985 100644
--- a/newlib/libc/iconv/lib/Makefile.am
+++ b/newlib/libc/iconv/lib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
aliasesi.c \
diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am
index 5972d1a9e64f..d14fd668930e 100644
--- a/newlib/libc/locale/Makefile.am
+++ b/newlib/libc/locale/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = setlocale.h locale.c localeconv.c
diff --git a/newlib/libc/machine/a29k/Makefile.am b/newlib/libc/machine/a29k/Makefile.am
index 74820dd030ed..0264d7bc04a8 100644
--- a/newlib/libc/machine/a29k/Makefile.am
+++ b/newlib/libc/machine/a29k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
index d13fb9674968..a131f866e4c1 100644
--- a/newlib/libc/machine/aarch64/Makefile.am
+++ b/newlib/libc/machine/aarch64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/amdgcn/Makefile.am b/newlib/libc/machine/amdgcn/Makefile.am
index 756d1205c862..34c0399d55a1 100644
--- a/newlib/libc/machine/amdgcn/Makefile.am
+++ b/newlib/libc/machine/amdgcn/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/arc/Makefile.am b/newlib/libc/machine/arc/Makefile.am
index 5f1ba44cca22..47ff14791c08 100644
--- a/newlib/libc/machine/arc/Makefile.am
+++ b/newlib/libc/machine/arc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 13d001cb6e03..ba308c195afa 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/bfin/Makefile.am b/newlib/libc/machine/bfin/Makefile.am
index c02a8e7cc1ed..98eeda0fd60e 100644
--- a/newlib/libc/machine/bfin/Makefile.am
+++ b/newlib/libc/machine/bfin/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/cr16/Makefile.am b/newlib/libc/machine/cr16/Makefile.am
index 8333419d5cf4..f9204e299401 100644
--- a/newlib/libc/machine/cr16/Makefile.am
+++ b/newlib/libc/machine/cr16/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
index 62bb46e98eb8..1b8e3bfc2ec3 100644
--- a/newlib/libc/machine/cris/Makefile.am
+++ b/newlib/libc/machine/cris/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
index 8333419d5cf4..f9204e299401 100644
--- a/newlib/libc/machine/crx/Makefile.am
+++ b/newlib/libc/machine/crx/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/csky/Makefile.am b/newlib/libc/machine/csky/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/csky/Makefile.am
+++ b/newlib/libc/machine/csky/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/d10v/Makefile.am b/newlib/libc/machine/d10v/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/d10v/Makefile.am
+++ b/newlib/libc/machine/d10v/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/d30v/Makefile.am b/newlib/libc/machine/d30v/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/d30v/Makefile.am
+++ b/newlib/libc/machine/d30v/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/epiphany/Makefile.am b/newlib/libc/machine/epiphany/Makefile.am
index 5ad22a1d6dc6..61fff1648852 100644
--- a/newlib/libc/machine/epiphany/Makefile.am
+++ b/newlib/libc/machine/epiphany/Makefile.am
@@ -26,7 +26,7 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/fr30/Makefile.am b/newlib/libc/machine/fr30/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/fr30/Makefile.am
+++ b/newlib/libc/machine/fr30/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/frv/Makefile.am
+++ b/newlib/libc/machine/frv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/ft32/Makefile.am b/newlib/libc/machine/ft32/Makefile.am
index 3a4882686190..43c38c00211b 100644
--- a/newlib/libc/machine/ft32/Makefile.am
+++ b/newlib/libc/machine/ft32/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index 7e0dba80068d..54ba703056ef 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/h8500/Makefile.am b/newlib/libc/machine/h8500/Makefile.am
index 9ff139f07958..2fe66abedc3f 100644
--- a/newlib/libc/machine/h8500/Makefile.am
+++ b/newlib/libc/machine/h8500/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/hppa/Makefile.am b/newlib/libc/machine/hppa/Makefile.am
index 11a29116a9c0..4875bfbc3625 100644
--- a/newlib/libc/machine/hppa/Makefile.am
+++ b/newlib/libc/machine/hppa/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index d4c734179209..28525ae5790b 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/i960/Makefile.am b/newlib/libc/machine/i960/Makefile.am
index c542e1285ded..85b3a36ba83d 100644
--- a/newlib/libc/machine/i960/Makefile.am
+++ b/newlib/libc/machine/i960/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ b/newlib/libc/machine/iq2000/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/lm32/Makefile.am b/newlib/libc/machine/lm32/Makefile.am
index 84e1efe4e80e..a1c515e528a5 100644
--- a/newlib/libc/machine/lm32/Makefile.am
+++ b/newlib/libc/machine/lm32/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/m32c/Makefile.am
+++ b/newlib/libc/machine/m32c/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/m32r/Makefile.am b/newlib/libc/machine/m32r/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/m32r/Makefile.am
+++ b/newlib/libc/machine/m32r/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ b/newlib/libc/machine/m68hc11/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am
index b70b44d03e80..cc8e9ae06954 100644
--- a/newlib/libc/machine/m68k/Makefile.am
+++ b/newlib/libc/machine/m68k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/m88k/Makefile.am b/newlib/libc/machine/m88k/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/m88k/Makefile.am
+++ b/newlib/libc/machine/m88k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/mep/Makefile.am b/newlib/libc/machine/mep/Makefile.am
index 0a25f74d9019..cba3878c8e43 100644
--- a/newlib/libc/machine/mep/Makefile.am
+++ b/newlib/libc/machine/mep/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/microblaze/Makefile.am b/newlib/libc/machine/microblaze/Makefile.am
index 337cc115537d..66ddd0144e64 100644
--- a/newlib/libc/machine/microblaze/Makefile.am
+++ b/newlib/libc/machine/microblaze/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index 2ea05743e25d..1cdec2f073a1 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/mn10200/Makefile.am b/newlib/libc/machine/mn10200/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/mn10200/Makefile.am
+++ b/newlib/libc/machine/mn10200/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/mn10300/Makefile.am b/newlib/libc/machine/mn10300/Makefile.am
index dc501d19c460..4016de0cde59 100644
--- a/newlib/libc/machine/mn10300/Makefile.am
+++ b/newlib/libc/machine/mn10300/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS) -Wa,--gdwarf-2
diff --git a/newlib/libc/machine/moxie/Makefile.am b/newlib/libc/machine/moxie/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/moxie/Makefile.am
+++ b/newlib/libc/machine/moxie/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/msp430/Makefile.am b/newlib/libc/machine/msp430/Makefile.am
index 8f53099cf220..4d21eaeebe69 100644
--- a/newlib/libc/machine/msp430/Makefile.am
+++ b/newlib/libc/machine/msp430/Makefile.am
@@ -13,7 +13,7 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/mt/Makefile.am
+++ b/newlib/libc/machine/mt/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/nds32/Makefile.am b/newlib/libc/machine/nds32/Makefile.am
index 1d559c3b35c0..aa2cdc872aa3 100644
--- a/newlib/libc/machine/nds32/Makefile.am
+++ b/newlib/libc/machine/nds32/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/necv70/Makefile.am b/newlib/libc/machine/necv70/Makefile.am
index 2507b48d8751..23c051fcdad5 100644
--- a/newlib/libc/machine/necv70/Makefile.am
+++ b/newlib/libc/machine/necv70/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/nios2/Makefile.am b/newlib/libc/machine/nios2/Makefile.am
index 219cda97baef..5badafc8fddb 100644
--- a/newlib/libc/machine/nios2/Makefile.am
+++ b/newlib/libc/machine/nios2/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/nvptx/Makefile.am b/newlib/libc/machine/nvptx/Makefile.am
index b019f9cd6fd9..62e9f27864dc 100644
--- a/newlib/libc/machine/nvptx/Makefile.am
+++ b/newlib/libc/machine/nvptx/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/or1k/Makefile.am b/newlib/libc/machine/or1k/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/or1k/Makefile.am
+++ b/newlib/libc/machine/or1k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index 6e3b391f2028..54d9c58c59dd 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/pru/Makefile.am b/newlib/libc/machine/pru/Makefile.am
index 219cda97baef..5badafc8fddb 100644
--- a/newlib/libc/machine/pru/Makefile.am
+++ b/newlib/libc/machine/pru/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/riscv/Makefile.am b/newlib/libc/machine/riscv/Makefile.am
index 0e785c09caad..7bd1b78602f5 100644
--- a/newlib/libc/machine/riscv/Makefile.am
+++ b/newlib/libc/machine/riscv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/rl78/Makefile.am b/newlib/libc/machine/rl78/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/rl78/Makefile.am
+++ b/newlib/libc/machine/rl78/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/rx/Makefile.am b/newlib/libc/machine/rx/Makefile.am
index 265698e7da90..cce129a12338 100644
--- a/newlib/libc/machine/rx/Makefile.am
+++ b/newlib/libc/machine/rx/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index a71f1fd47ba6..b0f904775fb7 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/sparc/Makefile.am b/newlib/libc/machine/sparc/Makefile.am
index 11a53f6eae96..d54555777222 100644
--- a/newlib/libc/machine/sparc/Makefile.am
+++ b/newlib/libc/machine/sparc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/spu/Makefile.am b/newlib/libc/machine/spu/Makefile.am
index 6189df254567..611ec34850a6 100644
--- a/newlib/libc/machine/spu/Makefile.am
+++ b/newlib/libc/machine/spu/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ b/newlib/libc/machine/tic4x/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/tic6x/Makefile.am b/newlib/libc/machine/tic6x/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/tic6x/Makefile.am
+++ b/newlib/libc/machine/tic6x/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/tic80/Makefile.am b/newlib/libc/machine/tic80/Makefile.am
index 667933a4dbf8..01355a09c5e9 100644
--- a/newlib/libc/machine/tic80/Makefile.am
+++ b/newlib/libc/machine/tic80/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/v850/Makefile.am b/newlib/libc/machine/v850/Makefile.am
index 0a25f74d9019..cba3878c8e43 100644
--- a/newlib/libc/machine/v850/Makefile.am
+++ b/newlib/libc/machine/v850/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/visium/Makefile.am b/newlib/libc/machine/visium/Makefile.am
index 5cde6b260327..62e11cf1cb0a 100644
--- a/newlib/libc/machine/visium/Makefile.am
+++ b/newlib/libc/machine/visium/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index 05499a012337..338024389b2c 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/x86_64/Makefile.am b/newlib/libc/machine/x86_64/Makefile.am
index c26d4dd637a8..e6510cea74ca 100644
--- a/newlib/libc/machine/x86_64/Makefile.am
+++ b/newlib/libc/machine/x86_64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/xc16x/Makefile.am b/newlib/libc/machine/xc16x/Makefile.am
index 187d8358a7c4..fe1b80b7fd9d 100644
--- a/newlib/libc/machine/xc16x/Makefile.am
+++ b/newlib/libc/machine/xc16x/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
index c20b01cfb053..877c59bf615a 100644
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ b/newlib/libc/machine/xstormy16/Makefile.am
@@ -2,7 +2,7 @@
# hack: putting $(abs_newlib_basedir)/libm/common into AM_CPPFLAGS forces automake
# to output a definition for newlib_basedir.
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index bcdb18666d2d..5dbd32808127 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am
index d4d70a92654d..a9fdf70c5d6f 100644
--- a/newlib/libc/misc/Makefile.am
+++ b/newlib/libc/misc/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = __dprintf.c unctrl.c ffs.c init.c fini.c
diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am
index bbf0a1c2d9a1..571d57203222 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
closedir.c collate.c collcmp.c creat.c dirfd.c \
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index e645665ca1b7..912febaab504 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
if HAVE_STDIO64_DIR
STDIO64_SOURCES = \
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am
index 259af432c974..afd9c0499135 100644
--- a/newlib/libc/search/Makefile.am
+++ b/newlib/libc/search/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bsearch.c \
diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am
index 53b3bd5b0f04..b8afefeadc90 100644
--- a/newlib/libc/signal/Makefile.am
+++ b/newlib/libc/signal/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = psignal.c raise.c signal.c sig2str.c
diff --git a/newlib/libc/ssp/Makefile.am b/newlib/libc/ssp/Makefile.am
index 7814cd98c3b8..c56224ab1e79 100644
--- a/newlib/libc/ssp/Makefile.am
+++ b/newlib/libc/ssp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
chk_fail.c \
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index a2c688cbe72f..538549c6aba8 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
if NEWLIB_NANO_FORMATTED_IO
GENERAL_INT_FORMATTED_IO_SOURCES =
diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am
index c3522dd7db00..61104d6c39b8 100644
--- a/newlib/libc/stdio64/Makefile.am
+++ b/newlib/libc/stdio64/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
# need a dummy object so objectlist.awk.in will build every time
GENERAL_SOURCES = dummy.c local64.h
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 2d089308932b..771ce7c7fe27 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
__adjust.c \
diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index b35d076cf621..05ddf751f478 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
bcopy.c \
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index f2e8644f8726..174934d59f31 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
index 87f63301a5c4..61eb3dd673ef 100644
--- a/newlib/libc/sys/amdgcn/Makefile.am
+++ b/newlib/libc/sys/amdgcn/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 964813725350..719b39e29b6b 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(abs_newlib_basedir)/libc/machine/arm
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) -I$(abs_newlib_basedir)/libc/machine/arm
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index 50866743a048..f8a9ca1af170 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
index 5448105206db..a4e685f10420 100644
--- a/newlib/libc/sys/epiphany/Makefile.am
+++ b/newlib/libc/sys/epiphany/Makefile.am
@@ -26,7 +26,7 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 634c9071eb5b..0e0e3bd0ed66 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 57abb9f29199..91389b0a42db 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index 60967d846dbf..1ee90fff8648 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 24b0eccf39e5..fcb4dce17548 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index d2f1fec50dfa..a4041ac87418 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
index 88f2c1eccbd1..8c005b24a1b2 100644
--- a/newlib/libc/sys/or1k/Makefile.am
+++ b/newlib/libc/sys/or1k/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index 49647c207544..972d03f87860 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
SUBDIRS = machine
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.am b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
index fd44bd23bac2..a50ed059027e 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = syscall.S
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 0bc1d26fd1ee..42a396d84a4d 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index d1604295676f..9e6977f153fb 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 6dc19fe43dfa..3ad9bd3b4d5f 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS) $(CFLAGS)
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index 815ebcd689b2..bcd220f8ad57 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index d62fd8b3a72c..531796f45edc 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index 874c40b61147..a597a790edd8 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index 03bc72d2f011..e8f18a118174 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index e5618f961707..14181271d999 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index 0f3a5555bfa1..145918e9d01e 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
index c9f73119b025..7347bad4ec16 100644
--- a/newlib/libc/sys/tirtos/Makefile.am
+++ b/newlib/libc/sys/tirtos/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index e58f2ecd5701..5e674e39e5f0 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index 0c6706ff60ef..71c84aec60a6 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am
index 605db04fb095..418943f8dff7 100644
--- a/newlib/libc/syscalls/Makefile.am
+++ b/newlib/libc/syscalls/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
sysclose.c \
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index 39d6b9bf085d..96cb6c2dfbb9 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
asctime.c \
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index 95115e2d0945..535521121b6c 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
getcwd.c \
diff --git a/newlib/libc/xdr/Makefile.am b/newlib/libc/xdr/Makefile.am
index 3bb41a1d1055..598da8fe9e6a 100644
--- a/newlib/libc/xdr/Makefile.am
+++ b/newlib/libc/xdr/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
xdr_private.c \
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index 5000406fe350..90a02b9d313f 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \
s_cbrt.c s_exp10.c s_expm1.c s_ilogb.c \
diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am
index a92990e3edbd..49c1e6b1638a 100644
--- a/newlib/libm/complex/Makefile.am
+++ b/newlib/libm/complex/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \
catan.c catanh.c ccos.c ccosh.c cephes_subr.c \
diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am
index 58cda3806822..ccd40c1a8134 100644
--- a/newlib/libm/fenv/Makefile.am
+++ b/newlib/libm/fenv/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src = feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
fegetround.c feholdexcept.c feraiseexcept.c fesetenv.c \
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am
index 6310f72b680d..96e782f4a341 100644
--- a/newlib/libm/machine/aarch64/Makefile.am
+++ b/newlib/libm/machine/aarch64/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
e_sqrt.c \
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index f8a542bb3599..d8842f91705b 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
e_sqrt.c \
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index d5caa4577d2a..4b9781883899 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/newlib/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am
index 07c2f424e5d0..ff29858be26e 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am
index b07c188180b1..8810f17f9409 100644
--- a/newlib/libm/machine/nds32/Makefile.am
+++ b/newlib/libm/machine/nds32/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src =
diff --git a/newlib/libm/machine/powerpc/Makefile.am b/newlib/libm/machine/powerpc/Makefile.am
index 020a3ac7aeec..9a10297992ea 100644
--- a/newlib/libm/machine/powerpc/Makefile.am
+++ b/newlib/libm/machine/powerpc/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/pru/Makefile.am b/newlib/libm/machine/pru/Makefile.am
index 6e055a34b972..b530c97f84f2 100644
--- a/newlib/libm/machine/pru/Makefile.am
+++ b/newlib/libm/machine/pru/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
fpclassify.c fpclassifyf.c isfinite.c isfinitef.c isinf.c \
diff --git a/newlib/libm/machine/riscv/Makefile.am b/newlib/libm/machine/riscv/Makefile.am
index 0e23cd615f82..1d228a868a3a 100644
--- a/newlib/libm/machine/riscv/Makefile.am
+++ b/newlib/libm/machine/riscv/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/sparc/Makefile.am b/newlib/libm/machine/sparc/Makefile.am
index c0e6c510c4ce..d0addf6702a3 100644
--- a/newlib/libm/machine/sparc/Makefile.am
+++ b/newlib/libm/machine/sparc/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am
index 87be8d429576..c1c6b4ac0c9a 100644
--- a/newlib/libm/machine/spu/Makefile.am
+++ b/newlib/libm/machine/spu/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/x86_64/Makefile.am b/newlib/libm/machine/x86_64/Makefile.am
index 9fc16c247f1c..5815dc91e6af 100644
--- a/newlib/libm/machine/x86_64/Makefile.am
+++ b/newlib/libm/machine/x86_64/Makefile.am
@@ -1,7 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) \
- $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I $(abs_newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
feclearexcept.c fegetenv.c fegetexceptflag.c fegetround.c \
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index c755d464e72e..2baefb069e51 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src = k_standard.c k_rem_pio2.c \
k_cos.c k_sin.c k_tan.c \
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index ada632326997..bd77fb16de6d 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
src = s_acos.c s_frexp.c s_mathcnst.c \
s_cos.c s_sinh.c \
--
2.34.1