Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
Diffstat (limited to 'newlib')
-rw-r--r--newlib/Makefile.am2
-rw-r--r--newlib/README13
-rw-r--r--newlib/acinclude.m42
-rw-r--r--newlib/iconvdata/Makefile.am2
-rw-r--r--newlib/libc/Makefile.am2
-rw-r--r--newlib/libc/argz/Makefile.am2
-rw-r--r--newlib/libc/ctype/Makefile.am2
-rw-r--r--newlib/libc/errno/Makefile.am2
-rw-r--r--newlib/libc/iconv/Makefile.am2
-rw-r--r--newlib/libc/iconv/ccs/Makefile.am2
-rw-r--r--newlib/libc/iconv/ccs/binary/Makefile.am2
-rw-r--r--newlib/libc/iconv/ces/Makefile.am2
-rw-r--r--newlib/libc/iconv/lib/Makefile.am2
-rw-r--r--newlib/libc/locale/Makefile.am2
-rw-r--r--newlib/libc/machine/Makefile.am2
-rw-r--r--newlib/libc/machine/a29k/Makefile.am2
-rw-r--r--newlib/libc/machine/aarch64/Makefile.am2
-rw-r--r--newlib/libc/machine/amdgcn/Makefile.am2
-rw-r--r--newlib/libc/machine/arc/Makefile.am2
-rw-r--r--newlib/libc/machine/arm/Makefile.am2
-rw-r--r--newlib/libc/machine/bfin/Makefile.am2
-rw-r--r--newlib/libc/machine/cr16/Makefile.am2
-rw-r--r--newlib/libc/machine/cris/Makefile.am2
-rw-r--r--newlib/libc/machine/crx/Makefile.am2
-rw-r--r--newlib/libc/machine/csky/Makefile.am2
-rw-r--r--newlib/libc/machine/d10v/Makefile.am2
-rw-r--r--newlib/libc/machine/d30v/Makefile.am2
-rw-r--r--newlib/libc/machine/epiphany/Makefile.am2
-rw-r--r--newlib/libc/machine/fr30/Makefile.am2
-rw-r--r--newlib/libc/machine/frv/Makefile.am2
-rw-r--r--newlib/libc/machine/ft32/Makefile.am2
-rw-r--r--newlib/libc/machine/h8300/Makefile.am2
-rw-r--r--newlib/libc/machine/h8500/Makefile.am2
-rw-r--r--newlib/libc/machine/hppa/Makefile.am2
-rw-r--r--newlib/libc/machine/i386/Makefile.am2
-rw-r--r--newlib/libc/machine/i960/Makefile.am2
-rw-r--r--newlib/libc/machine/iq2000/Makefile.am2
-rw-r--r--newlib/libc/machine/lm32/Makefile.am2
-rw-r--r--newlib/libc/machine/m32c/Makefile.am2
-rw-r--r--newlib/libc/machine/m32r/Makefile.am2
-rw-r--r--newlib/libc/machine/m68hc11/Makefile.am2
-rw-r--r--newlib/libc/machine/m68k/Makefile.am2
-rw-r--r--newlib/libc/machine/m88k/Makefile.am2
-rw-r--r--newlib/libc/machine/mep/Makefile.am2
-rw-r--r--newlib/libc/machine/microblaze/Makefile.am2
-rw-r--r--newlib/libc/machine/mips/Makefile.am2
-rw-r--r--newlib/libc/machine/mn10200/Makefile.am2
-rw-r--r--newlib/libc/machine/mn10300/Makefile.am2
-rw-r--r--newlib/libc/machine/moxie/Makefile.am2
-rw-r--r--newlib/libc/machine/msp430/Makefile.am2
-rw-r--r--newlib/libc/machine/mt/Makefile.am2
-rw-r--r--newlib/libc/machine/nds32/Makefile.am2
-rw-r--r--newlib/libc/machine/necv70/Makefile.am2
-rw-r--r--newlib/libc/machine/nios2/Makefile.am2
-rw-r--r--newlib/libc/machine/nvptx/Makefile.am2
-rw-r--r--newlib/libc/machine/or1k/Makefile.am2
-rw-r--r--newlib/libc/machine/powerpc/Makefile.am2
-rw-r--r--newlib/libc/machine/pru/Makefile.am2
-rw-r--r--newlib/libc/machine/riscv/Makefile.am2
-rw-r--r--newlib/libc/machine/rl78/Makefile.am2
-rw-r--r--newlib/libc/machine/rx/Makefile.am2
-rw-r--r--newlib/libc/machine/sh/Makefile.am2
-rw-r--r--newlib/libc/machine/sparc/Makefile.am2
-rw-r--r--newlib/libc/machine/spu/Makefile.am2
-rw-r--r--newlib/libc/machine/tic4x/Makefile.am2
-rw-r--r--newlib/libc/machine/tic6x/Makefile.am2
-rw-r--r--newlib/libc/machine/tic80/Makefile.am2
-rw-r--r--newlib/libc/machine/v850/Makefile.am2
-rw-r--r--newlib/libc/machine/visium/Makefile.am2
-rw-r--r--newlib/libc/machine/w65/Makefile.am2
-rw-r--r--newlib/libc/machine/x86_64/Makefile.am2
-rw-r--r--newlib/libc/machine/xc16x/Makefile.am2
-rw-r--r--newlib/libc/machine/xscale/Makefile.am2
-rw-r--r--newlib/libc/machine/xstormy16/Makefile.am2
-rw-r--r--newlib/libc/machine/z8k/Makefile.am2
-rw-r--r--newlib/libc/misc/Makefile.am2
-rw-r--r--newlib/libc/posix/Makefile.am2
-rw-r--r--newlib/libc/reent/Makefile.am2
-rw-r--r--newlib/libc/search/Makefile.am2
-rw-r--r--newlib/libc/signal/Makefile.am2
-rw-r--r--newlib/libc/ssp/Makefile.am2
-rw-r--r--newlib/libc/stdio/Makefile.am2
-rw-r--r--newlib/libc/stdio64/Makefile.am2
-rw-r--r--newlib/libc/stdlib/Makefile.am2
-rw-r--r--newlib/libc/string/Makefile.am2
-rw-r--r--newlib/libc/sys/Makefile.am2
-rw-r--r--newlib/libc/sys/a29khif/Makefile.am2
-rw-r--r--newlib/libc/sys/amdgcn/Makefile.am2
-rw-r--r--newlib/libc/sys/arm/Makefile.am2
-rw-r--r--newlib/libc/sys/d10v/Makefile.am2
-rw-r--r--newlib/libc/sys/decstation/Makefile.am2
-rw-r--r--newlib/libc/sys/epiphany/Makefile.am2
-rw-r--r--newlib/libc/sys/h8300hms/Makefile.am2
-rw-r--r--newlib/libc/sys/h8500hms/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/argp/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/cmath/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/dl/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/iconv/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/intl/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/machine/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/machine/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/machine/i386/Makefile.am2
-rw-r--r--newlib/libc/sys/linux/net/Makefile.am2
-rw-r--r--newlib/libc/sys/m88kbug/Makefile.am2
-rw-r--r--newlib/libc/sys/mmixware/Makefile.am2
-rw-r--r--newlib/libc/sys/netware/Makefile.am2
-rw-r--r--newlib/libc/sys/or1k/Makefile.am2
-rw-r--r--newlib/libc/sys/phoenix/Makefile.am2
-rw-r--r--newlib/libc/sys/phoenix/machine/Makefile.am2
-rw-r--r--newlib/libc/sys/phoenix/machine/arm/Makefile.am2
-rw-r--r--newlib/libc/sys/rdos/Makefile.am2
-rw-r--r--newlib/libc/sys/rtems/Makefile.am2
-rw-r--r--newlib/libc/sys/sh/Makefile.am2
-rw-r--r--newlib/libc/sys/sparc64/Makefile.am2
-rw-r--r--newlib/libc/sys/sun4/Makefile.am2
-rw-r--r--newlib/libc/sys/sysmec/Makefile.am2
-rw-r--r--newlib/libc/sys/sysnec810/Makefile.am2
-rw-r--r--newlib/libc/sys/sysnecv850/Makefile.am2
-rw-r--r--newlib/libc/sys/sysvi386/Makefile.am2
-rw-r--r--newlib/libc/sys/sysvnecv70/Makefile.am2
-rw-r--r--newlib/libc/sys/tic80/Makefile.am2
-rw-r--r--newlib/libc/sys/tirtos/Makefile.am2
-rw-r--r--newlib/libc/sys/w65/Makefile.am2
-rw-r--r--newlib/libc/sys/z8ksim/Makefile.am2
-rw-r--r--newlib/libc/syscalls/Makefile.am2
-rw-r--r--newlib/libc/time/Makefile.am2
-rw-r--r--newlib/libc/unix/Makefile.am2
-rw-r--r--newlib/libc/xdr/Makefile.am2
-rw-r--r--newlib/libm/Makefile.am2
-rw-r--r--newlib/libm/common/Makefile.am2
-rw-r--r--newlib/libm/complex/Makefile.am2
-rw-r--r--newlib/libm/fenv/Makefile.am2
-rw-r--r--newlib/libm/machine/Makefile.am2
-rw-r--r--newlib/libm/machine/aarch64/Makefile.am2
-rw-r--r--newlib/libm/machine/arm/Makefile.am2
-rw-r--r--newlib/libm/machine/i386/Makefile.am2
-rw-r--r--newlib/libm/machine/nds32/Makefile.am2
-rw-r--r--newlib/libm/machine/spu/Makefile.am2
-rw-r--r--newlib/libm/math/Makefile.am2
-rw-r--r--newlib/libm/mathfp/Makefile.am2
143 files changed, 9 insertions, 288 deletions
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 1235adb8b..a66752f1a 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus dejagnu subdir-objects
+AUTOMAKE_OPTIONS = dejagnu subdir-objects
ACLOCAL_AMFLAGS = -I . -I ..
# Variables that will accumulate in subdirs.
diff --git a/newlib/README b/newlib/README
index eac9f0045..8ed1871bd 100644
--- a/newlib/README
+++ b/newlib/README
@@ -576,9 +576,10 @@ from the newlib/libc/machine/arm directory.
If you have regenerated a configure file or if you have modified a Makefile.am
file, you will need to regenerate the appropriate Makefile.in file(s).
-For newlib, automake is a bit trickier. First of all, all Makefile.in
-files in newlib (and libgloss) are generated using the --cygnus option
-of automake.
+For newlib, automake is a bit trickier.
+
+First of all, note that all the Makefile.in files in libgloss must be
+generated using the --cygnus option of automake.
Makefile.in files are generated from the nearest directory up the chain
which contains a configure.ac file. In most cases, this is the same
@@ -590,21 +591,21 @@ which is the nearest parent directory that contains a configure.ac.
When you issue the automake command, you specify the subdirectory for
the Makefile.in you are regenerating. For example:
- automake --cygnus stdio/Makefile stdlib/Makefile
+ automake stdio/Makefile stdlib/Makefile
Note how multiple Makefile.in files can be created in the same step. You
would not specify machine/Makefile or sys/Makefile in the previous example
because both of these subdirectories contain their own configure.ac files.
One would change to each of these subdirectories and in turn issue:
- automake --cygnus Makefile
+ automake Makefile
Let's say you create a new machine directory XXXX off of newlib/libc/machine.
After creating a new configure.ac and Makefile.am file, you would issue:
aclocal -I ../../..
autoconf
- automake --cygnus Makefile
+ automake Makefile
from newlib/libc/machine/XXXX
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index f6e8d358d..3ec3fe500 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -120,7 +120,7 @@ AC_SUBST(newlib_basedir)
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([cygnus foreign no-installinfo no-dependencies no-dist no-define 1.9.5])
+AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define 1.9.5])
AM_MAINTAINER_MODE()
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
diff --git a/newlib/iconvdata/Makefile.am b/newlib/iconvdata/Makefile.am
index 9b1e6dd4e..ba72ccb30 100644
--- a/newlib/iconvdata/Makefile.am
+++ b/newlib/iconvdata/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if ELIX_LEVEL_1
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 10ebaedfa..0789d5f48 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
if HAVE_POSIX_DIR
POSIX_SUBDIR = posix
endif
diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am
index e5e690444..90df56af9 100644
--- a/newlib/libc/argz/Makefile.am
+++ b/newlib/libc/argz/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
## All functions in this directory are EL/IX level 2 and above
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index fa6a70d3a..345406f02 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/errno/Makefile.am b/newlib/libc/errno/Makefile.am
index 187e303c4..9713d7c72 100644
--- a/newlib/libc/errno/Makefile.am
+++ b/newlib/libc/errno/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = errno.c
diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am
index c4199247a..b8353bea1 100644
--- a/newlib/libc/iconv/Makefile.am
+++ b/newlib/libc/iconv/Makefile.am
@@ -1,6 +1,4 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = ces ccs lib .
cctdir=$(datadir)/iconv_data
diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index 295d846e2..22913b4e6 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = ccsbi.c \
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.am b/newlib/libc/iconv/ccs/binary/Makefile.am
index 5584ef257..ebaad06bb 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.am
+++ b/newlib/libc/iconv/ccs/binary/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
cctdir=$(datadir)/iconv_data
cct_DATA= \
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
index d81c5f552..46be1ef31 100644
--- a/newlib/libc/iconv/ces/Makefile.am
+++ b/newlib/libc/iconv/ces/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
index dd6c34054..3e3b8068c 100644
--- a/newlib/libc/iconv/lib/Makefile.am
+++ b/newlib/libc/iconv/lib/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am
index 7312654e1..c91a3742b 100644
--- a/newlib/libc/locale/Makefile.am
+++ b/newlib/libc/locale/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = setlocale.h locale.c localeconv.c
diff --git a/newlib/libc/machine/Makefile.am b/newlib/libc/machine/Makefile.am
index 831c0c36f..5fe8aac4a 100644
--- a/newlib/libc/machine/Makefile.am
+++ b/newlib/libc/machine/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(machine_dir) .
if HAVE_MACHINE_DIR
diff --git a/newlib/libc/machine/a29k/Makefile.am b/newlib/libc/machine/a29k/Makefile.am
index 977755cd7..d3dd75310 100644
--- a/newlib/libc/machine/a29k/Makefile.am
+++ b/newlib/libc/machine/a29k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
index e8b8197fa..ca7c79074 100644
--- a/newlib/libc/machine/aarch64/Makefile.am
+++ b/newlib/libc/machine/aarch64/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/amdgcn/Makefile.am b/newlib/libc/machine/amdgcn/Makefile.am
index f672115bd..accde8151 100644
--- a/newlib/libc/machine/amdgcn/Makefile.am
+++ b/newlib/libc/machine/amdgcn/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/arc/Makefile.am b/newlib/libc/machine/arc/Makefile.am
index 8dee84b09..fe477bff5 100644
--- a/newlib/libc/machine/arc/Makefile.am
+++ b/newlib/libc/machine/arc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 9bd35e733..2d559464a 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/bfin/Makefile.am b/newlib/libc/machine/bfin/Makefile.am
index 72d82b70f..c62a35d73 100644
--- a/newlib/libc/machine/bfin/Makefile.am
+++ b/newlib/libc/machine/bfin/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/cr16/Makefile.am b/newlib/libc/machine/cr16/Makefile.am
index eca778dfc..d8c033563 100644
--- a/newlib/libc/machine/cr16/Makefile.am
+++ b/newlib/libc/machine/cr16/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
index 4e75b6e8d..95085a137 100644
--- a/newlib/libc/machine/cris/Makefile.am
+++ b/newlib/libc/machine/cris/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
index eca778dfc..d8c033563 100644
--- a/newlib/libc/machine/crx/Makefile.am
+++ b/newlib/libc/machine/crx/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/csky/Makefile.am b/newlib/libc/machine/csky/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/csky/Makefile.am
+++ b/newlib/libc/machine/csky/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/d10v/Makefile.am b/newlib/libc/machine/d10v/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/d10v/Makefile.am
+++ b/newlib/libc/machine/d10v/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/d30v/Makefile.am b/newlib/libc/machine/d30v/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/d30v/Makefile.am
+++ b/newlib/libc/machine/d30v/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/epiphany/Makefile.am b/newlib/libc/machine/epiphany/Makefile.am
index 6e95d8fc8..8c0947024 100644
--- a/newlib/libc/machine/epiphany/Makefile.am
+++ b/newlib/libc/machine/epiphany/Makefile.am
@@ -26,8 +26,6 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/fr30/Makefile.am b/newlib/libc/machine/fr30/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/fr30/Makefile.am
+++ b/newlib/libc/machine/fr30/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/frv/Makefile.am
+++ b/newlib/libc/machine/frv/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/ft32/Makefile.am b/newlib/libc/machine/ft32/Makefile.am
index 4aa79b0d0..3d9ec9c73 100644
--- a/newlib/libc/machine/ft32/Makefile.am
+++ b/newlib/libc/machine/ft32/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index 378139a3f..2d394aebb 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/h8500/Makefile.am b/newlib/libc/machine/h8500/Makefile.am
index 9b71b8910..9d6594775 100644
--- a/newlib/libc/machine/h8500/Makefile.am
+++ b/newlib/libc/machine/h8500/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/hppa/Makefile.am b/newlib/libc/machine/hppa/Makefile.am
index 08f616a98..86ce650dc 100644
--- a/newlib/libc/machine/hppa/Makefile.am
+++ b/newlib/libc/machine/hppa/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index f835fe624..619488193 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/i960/Makefile.am b/newlib/libc/machine/i960/Makefile.am
index be95cc87d..d0421db10 100644
--- a/newlib/libc/machine/i960/Makefile.am
+++ b/newlib/libc/machine/i960/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ b/newlib/libc/machine/iq2000/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/lm32/Makefile.am b/newlib/libc/machine/lm32/Makefile.am
index c74adcf32..20be1ddca 100644
--- a/newlib/libc/machine/lm32/Makefile.am
+++ b/newlib/libc/machine/lm32/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/m32c/Makefile.am
+++ b/newlib/libc/machine/m32c/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/m32r/Makefile.am b/newlib/libc/machine/m32r/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/m32r/Makefile.am
+++ b/newlib/libc/machine/m32r/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ b/newlib/libc/machine/m68hc11/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am
index b48503072..08e1cf1d7 100644
--- a/newlib/libc/machine/m68k/Makefile.am
+++ b/newlib/libc/machine/m68k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/m88k/Makefile.am b/newlib/libc/machine/m88k/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/m88k/Makefile.am
+++ b/newlib/libc/machine/m88k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/mep/Makefile.am b/newlib/libc/machine/mep/Makefile.am
index fd8b2bec9..68a7b153c 100644
--- a/newlib/libc/machine/mep/Makefile.am
+++ b/newlib/libc/machine/mep/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/microblaze/Makefile.am b/newlib/libc/machine/microblaze/Makefile.am
index 335053a1e..4b43cd138 100644
--- a/newlib/libc/machine/microblaze/Makefile.am
+++ b/newlib/libc/machine/microblaze/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index 17f78aad7..fd2dedd8b 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/mn10200/Makefile.am b/newlib/libc/machine/mn10200/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/mn10200/Makefile.am
+++ b/newlib/libc/machine/mn10200/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/mn10300/Makefile.am b/newlib/libc/machine/mn10300/Makefile.am
index 491775c74..5dd7f63bb 100644
--- a/newlib/libc/machine/mn10300/Makefile.am
+++ b/newlib/libc/machine/mn10300/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/moxie/Makefile.am b/newlib/libc/machine/moxie/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/moxie/Makefile.am
+++ b/newlib/libc/machine/moxie/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/msp430/Makefile.am b/newlib/libc/machine/msp430/Makefile.am
index fd327f5c8..f253402f9 100644
--- a/newlib/libc/machine/msp430/Makefile.am
+++ b/newlib/libc/machine/msp430/Makefile.am
@@ -13,8 +13,6 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/mt/Makefile.am
+++ b/newlib/libc/machine/mt/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/nds32/Makefile.am b/newlib/libc/machine/nds32/Makefile.am
index 8abd7306b..b75c41f3b 100644
--- a/newlib/libc/machine/nds32/Makefile.am
+++ b/newlib/libc/machine/nds32/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/necv70/Makefile.am b/newlib/libc/machine/necv70/Makefile.am
index b3f856c53..ea804a197 100644
--- a/newlib/libc/machine/necv70/Makefile.am
+++ b/newlib/libc/machine/necv70/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/nios2/Makefile.am b/newlib/libc/machine/nios2/Makefile.am
index 60885128d..805640f95 100644
--- a/newlib/libc/machine/nios2/Makefile.am
+++ b/newlib/libc/machine/nios2/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/nvptx/Makefile.am b/newlib/libc/machine/nvptx/Makefile.am
index b0d4c7822..86d8d0342 100644
--- a/newlib/libc/machine/nvptx/Makefile.am
+++ b/newlib/libc/machine/nvptx/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/or1k/Makefile.am b/newlib/libc/machine/or1k/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/or1k/Makefile.am
+++ b/newlib/libc/machine/or1k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index e86afdf1c..577b7f9b3 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/pru/Makefile.am b/newlib/libc/machine/pru/Makefile.am
index 60885128d..805640f95 100644
--- a/newlib/libc/machine/pru/Makefile.am
+++ b/newlib/libc/machine/pru/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/riscv/Makefile.am b/newlib/libc/machine/riscv/Makefile.am
index 017b4be2e..a35144b7c 100644
--- a/newlib/libc/machine/riscv/Makefile.am
+++ b/newlib/libc/machine/riscv/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/rl78/Makefile.am b/newlib/libc/machine/rl78/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/rl78/Makefile.am
+++ b/newlib/libc/machine/rl78/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/rx/Makefile.am b/newlib/libc/machine/rx/Makefile.am
index 94f15ee07..14bc7a9d7 100644
--- a/newlib/libc/machine/rx/Makefile.am
+++ b/newlib/libc/machine/rx/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index f297868ff..73eb60db8 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/sparc/Makefile.am b/newlib/libc/machine/sparc/Makefile.am
index b6347188b..7a93a35af 100644
--- a/newlib/libc/machine/sparc/Makefile.am
+++ b/newlib/libc/machine/sparc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/spu/Makefile.am b/newlib/libc/machine/spu/Makefile.am
index 98705e09e..1d36daae8 100644
--- a/newlib/libc/machine/spu/Makefile.am
+++ b/newlib/libc/machine/spu/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
noinst_LIBRARIES = lib.a
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ b/newlib/libc/machine/tic4x/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/tic6x/Makefile.am b/newlib/libc/machine/tic6x/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/tic6x/Makefile.am
+++ b/newlib/libc/machine/tic6x/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/tic80/Makefile.am b/newlib/libc/machine/tic80/Makefile.am
index 5b78bc171..20c901380 100644
--- a/newlib/libc/machine/tic80/Makefile.am
+++ b/newlib/libc/machine/tic80/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/v850/Makefile.am b/newlib/libc/machine/v850/Makefile.am
index d91399b8f..46d0caba6 100644
--- a/newlib/libc/machine/v850/Makefile.am
+++ b/newlib/libc/machine/v850/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/visium/Makefile.am b/newlib/libc/machine/visium/Makefile.am
index 67cb313c8..1d9525bae 100644
--- a/newlib/libc/machine/visium/Makefile.am
+++ b/newlib/libc/machine/visium/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index 4d497e72d..e0a72c003 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/x86_64/Makefile.am b/newlib/libc/machine/x86_64/Makefile.am
index 3d53cbc85..890d1cae0 100644
--- a/newlib/libc/machine/x86_64/Makefile.am
+++ b/newlib/libc/machine/x86_64/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/xc16x/Makefile.am b/newlib/libc/machine/xc16x/Makefile.am
index 53cd447de..1a14b5978 100644
--- a/newlib/libc/machine/xc16x/Makefile.am
+++ b/newlib/libc/machine/xc16x/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/xscale/Makefile.am b/newlib/libc/machine/xscale/Makefile.am
index c7d96b264..3b9812eaa 100644
--- a/newlib/libc/machine/xscale/Makefile.am
+++ b/newlib/libc/machine/xscale/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
index 7178f6d59..ee508e7fa 100644
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ b/newlib/libc/machine/xstormy16/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-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)
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index 9d650111e..6a4b12112 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am
index 7571ef263..e76fb798a 100644
--- a/newlib/libc/misc/Makefile.am
+++ b/newlib/libc/misc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_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 5a358f782..32356ecde 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index ee11e864a..1a2014c0a 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if HAVE_STDIO64_DIR
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am
index a61107fb9..99a04f6c6 100644
--- a/newlib/libc/search/Makefile.am
+++ b/newlib/libc/search/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/signal/Makefile.am b/newlib/libc/signal/Makefile.am
index 89db26113..714a0677c 100644
--- a/newlib/libc/signal/Makefile.am
+++ b/newlib/libc/signal/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_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 23754baf5..b820e7786 100644
--- a/newlib/libc/ssp/Makefile.am
+++ b/newlib/libc/ssp/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index b430f130a..4702c8e04 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
if NEWLIB_NANO_FORMATTED_IO
diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am
index fd43ef879..34d9abb6f 100644
--- a/newlib/libc/stdio64/Makefile.am
+++ b/newlib/libc/stdio64/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
# need a dummy object so objectlist.awk.in will build every time
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 2f46c837c..a91bdc784 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index 49de080e1..78d7c4950 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/sys/Makefile.am b/newlib/libc/sys/Makefile.am
index 71de72cf1..af851bc30 100644
--- a/newlib/libc/sys/Makefile.am
+++ b/newlib/libc/sys/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(sys_dir) .
if HAVE_SYS_DIR
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index b026f9b68..e38065521 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
index 2b0c63bc4..8095cea7a 100644
--- a/newlib/libc/sys/amdgcn/Makefile.am
+++ b/newlib/libc/sys/amdgcn/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 711872de3..f5524b660 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(newlib_basedir)/libc/machine/arm
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index 203cf568a..07a147cbf 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
index f4a1ddfba..9fd0ab914 100644
--- a/newlib/libc/sys/decstation/Makefile.am
+++ b/newlib/libc/sys/decstation/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
index c95cca536..25ca852ba 100644
--- a/newlib/libc/sys/epiphany/Makefile.am
+++ b/newlib/libc/sys/epiphany/Makefile.am
@@ -26,8 +26,6 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 100deda2a..4bb7e0b98 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 79993514a..8f663353e 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 8dcc64e87..ab5c8df0e 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
if ELIX_LEVEL_1
diff --git a/newlib/libc/sys/linux/argp/Makefile.am b/newlib/libc/sys/linux/argp/Makefile.am
index 921a38caf..18aa3703e 100644
--- a/newlib/libc/sys/linux/argp/Makefile.am
+++ b/newlib/libc/sys/linux/argp/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libc/sys/linux/cmath/Makefile.am b/newlib/libc/sys/linux/cmath/Makefile.am
index 02f193be4..5bab8b254 100644
--- a/newlib/libc/sys/linux/cmath/Makefile.am
+++ b/newlib/libc/sys/linux/cmath/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libc/sys/linux/dl/Makefile.am b/newlib/libc/sys/linux/dl/Makefile.am
index d4a2fa636..92d801a5a 100644
--- a/newlib/libc/sys/linux/dl/Makefile.am
+++ b/newlib/libc/sys/linux/dl/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIB_SOURCES = \
diff --git a/newlib/libc/sys/linux/iconv/Makefile.am b/newlib/libc/sys/linux/iconv/Makefile.am
index b0233a1a5..3f9ec62b7 100644
--- a/newlib/libc/sys/linux/iconv/Makefile.am
+++ b/newlib/libc/sys/linux/iconv/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libc/sys/linux/intl/Makefile.am b/newlib/libc/sys/linux/intl/Makefile.am
index 3d7777d5a..441b6b245 100644
--- a/newlib/libc/sys/linux/intl/Makefile.am
+++ b/newlib/libc/sys/linux/intl/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.am b/newlib/libc/sys/linux/linuxthreads/Makefile.am
index d79d1c113..a62802323 100644
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
LIBTOOL_VERSION_INFO = 0:0:0
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am b/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am
index 158c5c92a..58b672b32 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(machine_dir) .
doc:
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
index 3281d4d40..1f27f3c7a 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = -I. -I$(srcdir) $(INCLUDES)
diff --git a/newlib/libc/sys/linux/machine/Makefile.am b/newlib/libc/sys/linux/machine/Makefile.am
index 16ebb5c7d..87a44ef02 100644
--- a/newlib/libc/sys/linux/machine/Makefile.am
+++ b/newlib/libc/sys/linux/machine/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(machine_dir) .
noinst_DATA = $(CRT0)
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.am b/newlib/libc/sys/linux/machine/i386/Makefile.am
index 1864d29e0..938efaca3 100644
--- a/newlib/libc/sys/linux/machine/i386/Makefile.am
+++ b/newlib/libc/sys/linux/machine/i386/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = get_clockfreq.c getpagesize.c hp-timing.c setjmp.S sigaction.c dl-procinfo.c
diff --git a/newlib/libc/sys/linux/net/Makefile.am b/newlib/libc/sys/linux/net/Makefile.am
index 0b1a0d978..da8ee0a57 100644
--- a/newlib/libc/sys/linux/net/Makefile.am
+++ b/newlib/libc/sys/linux/net/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = addr2ascii.c ascii2addr.c alias-lookup.c \
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index cf77a1cfa..3fcc0d118 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 0874dd902..e93d20289 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index 3bd29aaa7..44e54e597 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
index f3bcc0340..7259a557f 100644
--- a/newlib/libc/sys/or1k/Makefile.am
+++ b/newlib/libc/sys/or1k/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index e83be5303..583add08f 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
SUBDIRS = machine
diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/phoenix/machine/Makefile.am
index 7143bbf8a..ea94b6093 100644
--- a/newlib/libc/sys/phoenix/machine/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(machine_dir) .
noinst_DATA = $(CRT0) lib.a
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.am b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
index a7cb107a4..e47e6d05c 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = syscall.S
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 4ddcd8573..49b64bb21 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index f166564ce..0bb3130b5 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 15faeabbf..32a526e27 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES) $(CFLAGS)
diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
index 5f1aa8db5..2d8d56ac8 100644
--- a/newlib/libc/sys/sparc64/Makefile.am
+++ b/newlib/libc/sys/sparc64/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
index e6a067cab..47a17cced 100644
--- a/newlib/libc/sys/sun4/Makefile.am
+++ b/newlib/libc/sys/sun4/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index 4a504d06a..f75b9a35c 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index 0ae3fc55c..9347941b3 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index df150168c..05c909574 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index bd325a3ce..439ed7867 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index 0a421b755..6c847b0e1 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index 847b759e2..e192d592d 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
index fc6d1f37e..6349bc841 100644
--- a/newlib/libc/sys/tirtos/Makefile.am
+++ b/newlib/libc/sys/tirtos/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index 6507a9154..4237c53b2 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index 513b0febf..f677222e1 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am
index 31cf65913..67e0b0db2 100644
--- a/newlib/libc/syscalls/Makefile.am
+++ b/newlib/libc/syscalls/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index be040baec..fa6de133c 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
LIB_SOURCES = \
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index 9fd30b98e..fe81ac866 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libc/xdr/Makefile.am b/newlib/libc/xdr/Makefile.am
index 8d3ee4c4e..325126643 100644
--- a/newlib/libc/xdr/Makefile.am
+++ b/newlib/libc/xdr/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
GENERAL_SOURCES = \
diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 08b8387a5..514366bfa 100644
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
if NEWLIB_HW_FP
MATHDIR = mathfp
else
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index 1d178da4d..0f4189bac 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \
diff --git a/newlib/libm/complex/Makefile.am b/newlib/libm/complex/Makefile.am
index 897774197..3868c7626 100644
--- a/newlib/libm/complex/Makefile.am
+++ b/newlib/libm/complex/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../common -I$(srcdir)/ $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c \
diff --git a/newlib/libm/fenv/Makefile.am b/newlib/libm/fenv/Makefile.am
index ebe03970b..9d2954a42 100644
--- a/newlib/libm/fenv/Makefile.am
+++ b/newlib/libm/fenv/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = feclearexcept.c fe_dfl_env.c fegetenv.c fegetexceptflag.c \
diff --git a/newlib/libm/machine/Makefile.am b/newlib/libm/machine/Makefile.am
index d67175b10..678d95b0c 100644
--- a/newlib/libm/machine/Makefile.am
+++ b/newlib/libm/machine/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
SUBDIRS = $(libm_machine_dir) .
if HAVE_LIBM_MACHINE_DIR
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am
index 1025bc420..5f8770ae2 100644
--- a/newlib/libm/machine/aarch64/Makefile.am
+++ b/newlib/libm/machine/aarch64/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index ccb134d6a..45e175e05 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index 249f87691..52f2880bf 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES)
diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am
index b5afbd399..5fa129dcd 100644
--- a/newlib/libm/machine/nds32/Makefile.am
+++ b/newlib/libm/machine/nds32/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am
index 2ca70a751..9e2c5973b 100644
--- a/newlib/libm/machine/spu/Makefile.am
+++ b/newlib/libm/machine/spu/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) \
$(CROSS_CFLAGS) $(TARGET_CFLAGS)
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index 05cf87a4d..af31da003 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = k_standard.c k_rem_pio2.c \
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index db83ea082..67139e86e 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
src = s_acos.c s_frexp.c s_mathcnst.c \