[PATCH 7/7] newlib: libc: merge machine/ configure scripts up a level
Mike Frysinger
vapier@gentoo.org
Sun Jan 23 06:04:29 GMT 2022
The machine configure scripts are all effectively stub scripts that
pass the higher level options to its own makefile. There were only
three doing custom tests. The rest were all effectively the same as
the libc/ configure script.
So instead of recursively running configure in all of these subdirs,
generate their makefiles from the top-level configure. For the few
unique ones, deploy a pattern of including subdir logic via m4:
m4_include([machine/nds32/acinclude.m4])
Some of the generated machine makefiles have a bunch of extra stuff
added to them, but that's because they were inconsistent in their
configure libtool calls. The top-level has it, so it exports some
new vars to the ones that weren't already.
---
newlib/libc/Makefile.in | 7 +-
newlib/libc/argz/Makefile.in | 7 +-
newlib/libc/configure | 412 +-
newlib/libc/configure.ac | 127 +-
newlib/libc/ctype/Makefile.in | 7 +-
newlib/libc/errno/Makefile.in | 7 +-
newlib/libc/iconv/Makefile.in | 7 +-
newlib/libc/iconv/ccs/Makefile.in | 7 +-
newlib/libc/iconv/ccs/binary/Makefile.in | 7 +-
newlib/libc/iconv/ces/Makefile.in | 7 +-
newlib/libc/iconv/lib/Makefile.in | 7 +-
newlib/libc/locale/Makefile.in | 7 +-
newlib/libc/machine/a29k/Makefile.am | 3 -
newlib/libc/machine/a29k/Makefile.in | 142 +-
newlib/libc/machine/a29k/aclocal.m4 | 1109 --
newlib/libc/machine/a29k/configure | 4942 ------
newlib/libc/machine/a29k/configure.ac | 13 -
newlib/libc/machine/aarch64/Makefile.am | 3 -
newlib/libc/machine/aarch64/Makefile.in | 159 +-
newlib/libc/machine/aarch64/aclocal.m4 | 1109 --
newlib/libc/machine/aarch64/configure | 4942 ------
newlib/libc/machine/aarch64/configure.ac | 13 -
newlib/libc/machine/amdgcn/Makefile.am | 3 -
newlib/libc/machine/amdgcn/Makefile.in | 144 +-
newlib/libc/machine/amdgcn/aclocal.m4 | 1109 --
newlib/libc/machine/amdgcn/configure | 4942 ------
newlib/libc/machine/amdgcn/configure.ac | 13 -
newlib/libc/machine/arc/Makefile.am | 3 -
newlib/libc/machine/arc/Makefile.in | 159 +-
newlib/libc/machine/arc/aclocal.m4 | 1109 --
newlib/libc/machine/arc/configure | 4942 ------
newlib/libc/machine/arc/configure.ac | 12 -
newlib/libc/machine/arm/Makefile.am | 3 -
newlib/libc/machine/arm/Makefile.in | 158 +-
newlib/libc/machine/arm/aclocal.m4 | 1109 --
newlib/libc/machine/arm/configure | 4945 ------
newlib/libc/machine/arm/configure.ac | 15 -
newlib/libc/machine/bfin/Makefile.am | 3 -
newlib/libc/machine/bfin/Makefile.in | 152 +-
newlib/libc/machine/bfin/aclocal.m4 | 1109 --
newlib/libc/machine/bfin/configure | 4942 ------
newlib/libc/machine/bfin/configure.ac | 13 -
newlib/libc/machine/cr16/Makefile.am | 3 -
newlib/libc/machine/cr16/Makefile.in | 159 +-
newlib/libc/machine/cr16/aclocal.m4 | 1109 --
newlib/libc/machine/cr16/configure | 4942 ------
newlib/libc/machine/cr16/configure.ac | 13 -
newlib/libc/machine/cris/Makefile.am | 3 -
newlib/libc/machine/cris/Makefile.in | 156 +-
newlib/libc/machine/cris/aclocal.m4 | 1109 --
newlib/libc/machine/cris/configure | 4942 ------
newlib/libc/machine/cris/configure.ac | 13 -
newlib/libc/machine/crx/Makefile.am | 3 -
newlib/libc/machine/crx/Makefile.in | 159 +-
newlib/libc/machine/crx/aclocal.m4 | 1109 --
newlib/libc/machine/crx/configure | 4942 ------
newlib/libc/machine/crx/configure.ac | 13 -
newlib/libc/machine/csky/Makefile.am | 3 -
newlib/libc/machine/csky/Makefile.in | 152 +-
newlib/libc/machine/csky/aclocal.m4 | 1109 --
newlib/libc/machine/csky/configure | 4942 ------
newlib/libc/machine/csky/configure.ac | 13 -
newlib/libc/machine/d10v/Makefile.am | 3 -
newlib/libc/machine/d10v/Makefile.in | 152 +-
newlib/libc/machine/d10v/aclocal.m4 | 1109 --
newlib/libc/machine/d10v/configure | 4942 ------
newlib/libc/machine/d10v/configure.ac | 13 -
newlib/libc/machine/d30v/Makefile.am | 3 -
newlib/libc/machine/d30v/Makefile.in | 152 +-
newlib/libc/machine/d30v/aclocal.m4 | 1109 --
newlib/libc/machine/d30v/configure | 4942 ------
newlib/libc/machine/d30v/configure.ac | 13 -
newlib/libc/machine/epiphany/Makefile.am | 3 -
newlib/libc/machine/epiphany/Makefile.in | 152 +-
newlib/libc/machine/epiphany/aclocal.m4 | 1109 --
newlib/libc/machine/epiphany/configure | 4942 ------
newlib/libc/machine/epiphany/configure.ac | 40 -
newlib/libc/machine/fr30/Makefile.am | 3 -
newlib/libc/machine/fr30/Makefile.in | 152 +-
newlib/libc/machine/fr30/aclocal.m4 | 1109 --
newlib/libc/machine/fr30/configure | 4942 ------
newlib/libc/machine/fr30/configure.ac | 13 -
newlib/libc/machine/frv/Makefile.am | 3 -
newlib/libc/machine/frv/Makefile.in | 152 +-
newlib/libc/machine/frv/aclocal.m4 | 1109 --
newlib/libc/machine/frv/configure | 4942 ------
newlib/libc/machine/frv/configure.ac | 13 -
newlib/libc/machine/ft32/Makefile.am | 3 -
newlib/libc/machine/ft32/Makefile.in | 152 +-
newlib/libc/machine/ft32/aclocal.m4 | 1109 --
newlib/libc/machine/ft32/configure | 4942 ------
newlib/libc/machine/ft32/configure.ac | 13 -
newlib/libc/machine/h8300/Makefile.am | 3 -
newlib/libc/machine/h8300/Makefile.in | 152 +-
newlib/libc/machine/h8300/aclocal.m4 | 1109 --
newlib/libc/machine/h8300/configure | 4942 ------
newlib/libc/machine/h8300/configure.ac | 13 -
newlib/libc/machine/h8500/Makefile.am | 3 -
newlib/libc/machine/h8500/Makefile.in | 159 +-
newlib/libc/machine/h8500/aclocal.m4 | 1109 --
newlib/libc/machine/h8500/configure | 4942 ------
newlib/libc/machine/h8500/configure.ac | 13 -
newlib/libc/machine/hppa/Makefile.am | 3 -
newlib/libc/machine/hppa/Makefile.in | 152 +-
newlib/libc/machine/hppa/aclocal.m4 | 1109 --
newlib/libc/machine/hppa/configure | 4942 ------
newlib/libc/machine/hppa/configure.ac | 13 -
newlib/libc/machine/i386/Makefile.am | 3 -
newlib/libc/machine/i386/Makefile.in | 120 +-
newlib/libc/machine/i386/aclocal.m4 | 1178 --
newlib/libc/machine/i386/configure | 14184 ------------------
newlib/libc/machine/i386/configure.ac | 25 -
newlib/libc/machine/i960/Makefile.am | 3 -
newlib/libc/machine/i960/Makefile.in | 142 +-
newlib/libc/machine/i960/aclocal.m4 | 1109 --
newlib/libc/machine/i960/configure | 4942 ------
newlib/libc/machine/i960/configure.ac | 13 -
newlib/libc/machine/iq2000/Makefile.am | 3 -
newlib/libc/machine/iq2000/Makefile.in | 152 +-
newlib/libc/machine/iq2000/aclocal.m4 | 1109 --
newlib/libc/machine/iq2000/configure | 4942 ------
newlib/libc/machine/iq2000/configure.ac | 13 -
newlib/libc/machine/lm32/Makefile.am | 4 -
newlib/libc/machine/lm32/Makefile.in | 152 +-
newlib/libc/machine/lm32/aclocal.m4 | 1109 --
newlib/libc/machine/lm32/configure | 4942 ------
newlib/libc/machine/lm32/configure.ac | 13 -
newlib/libc/machine/m32c/Makefile.am | 3 -
newlib/libc/machine/m32c/Makefile.in | 152 +-
newlib/libc/machine/m32c/aclocal.m4 | 1109 --
newlib/libc/machine/m32c/configure | 4942 ------
newlib/libc/machine/m32c/configure.ac | 13 -
newlib/libc/machine/m32r/Makefile.am | 3 -
newlib/libc/machine/m32r/Makefile.in | 152 +-
newlib/libc/machine/m32r/aclocal.m4 | 1109 --
newlib/libc/machine/m32r/configure | 4942 ------
newlib/libc/machine/m32r/configure.ac | 13 -
newlib/libc/machine/m68hc11/Makefile.am | 3 -
newlib/libc/machine/m68hc11/Makefile.in | 152 +-
newlib/libc/machine/m68hc11/aclocal.m4 | 1109 --
newlib/libc/machine/m68hc11/configure | 4942 ------
newlib/libc/machine/m68hc11/configure.ac | 13 -
newlib/libc/machine/m68k/Makefile.am | 3 -
newlib/libc/machine/m68k/Makefile.in | 159 +-
newlib/libc/machine/m68k/aclocal.m4 | 1109 --
newlib/libc/machine/m68k/configure | 4942 ------
newlib/libc/machine/m68k/configure.ac | 13 -
newlib/libc/machine/m88k/Makefile.am | 3 -
newlib/libc/machine/m88k/Makefile.in | 152 +-
newlib/libc/machine/m88k/aclocal.m4 | 1109 --
newlib/libc/machine/m88k/configure | 4942 ------
newlib/libc/machine/m88k/configure.ac | 13 -
newlib/libc/machine/mep/Makefile.am | 3 -
newlib/libc/machine/mep/Makefile.in | 152 +-
newlib/libc/machine/mep/aclocal.m4 | 1109 --
newlib/libc/machine/mep/configure | 4942 ------
newlib/libc/machine/mep/configure.ac | 13 -
newlib/libc/machine/microblaze/Makefile.am | 3 -
newlib/libc/machine/microblaze/Makefile.in | 159 +-
newlib/libc/machine/microblaze/aclocal.m4 | 1109 --
newlib/libc/machine/microblaze/configure | 4942 ------
newlib/libc/machine/microblaze/configure.ac | 13 -
newlib/libc/machine/mips/Makefile.am | 3 -
newlib/libc/machine/mips/Makefile.in | 155 +-
newlib/libc/machine/mips/aclocal.m4 | 1109 --
newlib/libc/machine/mips/configure | 4942 ------
newlib/libc/machine/mips/configure.ac | 13 -
newlib/libc/machine/mn10200/Makefile.am | 3 -
newlib/libc/machine/mn10200/Makefile.in | 152 +-
newlib/libc/machine/mn10200/aclocal.m4 | 1109 --
newlib/libc/machine/mn10200/configure | 4942 ------
newlib/libc/machine/mn10200/configure.ac | 13 -
newlib/libc/machine/mn10300/Makefile.am | 3 -
newlib/libc/machine/mn10300/Makefile.in | 152 +-
newlib/libc/machine/mn10300/aclocal.m4 | 1109 --
newlib/libc/machine/mn10300/configure | 4942 ------
newlib/libc/machine/mn10300/configure.ac | 13 -
newlib/libc/machine/moxie/Makefile.am | 3 -
newlib/libc/machine/moxie/Makefile.in | 152 +-
newlib/libc/machine/moxie/aclocal.m4 | 1109 --
newlib/libc/machine/moxie/configure | 4942 ------
newlib/libc/machine/moxie/configure.ac | 13 -
newlib/libc/machine/msp430/Makefile.am | 3 -
newlib/libc/machine/msp430/Makefile.in | 159 +-
newlib/libc/machine/msp430/aclocal.m4 | 1109 --
newlib/libc/machine/msp430/configure | 4970 ------
newlib/libc/machine/msp430/configure.ac | 37 -
newlib/libc/machine/mt/Makefile.am | 3 -
newlib/libc/machine/mt/Makefile.in | 152 +-
newlib/libc/machine/mt/aclocal.m4 | 1109 --
newlib/libc/machine/mt/configure | 4942 ------
newlib/libc/machine/mt/configure.ac | 13 -
newlib/libc/machine/nds32/Makefile.am | 3 -
newlib/libc/machine/nds32/Makefile.in | 153 +-
newlib/libc/machine/nds32/acinclude.m4 | 10 +
newlib/libc/machine/nds32/aclocal.m4 | 1173 --
newlib/libc/machine/nds32/configure | 6031 --------
newlib/libc/machine/nds32/configure.ac | 22 -
newlib/libc/machine/necv70/Makefile.am | 3 -
newlib/libc/machine/necv70/Makefile.in | 152 +-
newlib/libc/machine/necv70/aclocal.m4 | 1109 --
newlib/libc/machine/necv70/configure | 4942 ------
newlib/libc/machine/necv70/configure.ac | 13 -
newlib/libc/machine/nios2/Makefile.am | 3 -
newlib/libc/machine/nios2/Makefile.in | 151 +-
newlib/libc/machine/nios2/aclocal.m4 | 1109 --
newlib/libc/machine/nios2/configure | 4942 ------
newlib/libc/machine/nios2/configure.ac | 13 -
newlib/libc/machine/nvptx/Makefile.am | 3 -
newlib/libc/machine/nvptx/Makefile.in | 144 +-
newlib/libc/machine/nvptx/aclocal.m4 | 1109 --
newlib/libc/machine/nvptx/configure | 4942 ------
newlib/libc/machine/nvptx/configure.ac | 13 -
newlib/libc/machine/or1k/Makefile.am | 3 -
newlib/libc/machine/or1k/Makefile.in | 152 +-
newlib/libc/machine/or1k/aclocal.m4 | 1109 --
newlib/libc/machine/or1k/configure | 4942 ------
newlib/libc/machine/or1k/configure.ac | 13 -
newlib/libc/machine/powerpc/Makefile.am | 4 -
newlib/libc/machine/powerpc/Makefile.in | 159 +-
newlib/libc/machine/powerpc/acinclude.m4 | 10 +
newlib/libc/machine/powerpc/aclocal.m4 | 1109 --
newlib/libc/machine/powerpc/configure | 4977 ------
newlib/libc/machine/powerpc/configure.ac | 22 -
newlib/libc/machine/pru/Makefile.am | 3 -
newlib/libc/machine/pru/Makefile.in | 151 +-
newlib/libc/machine/pru/aclocal.m4 | 1109 --
newlib/libc/machine/pru/configure | 4942 ------
newlib/libc/machine/pru/configure.ac | 13 -
newlib/libc/machine/riscv/Makefile.am | 3 -
newlib/libc/machine/riscv/Makefile.in | 159 +-
newlib/libc/machine/riscv/aclocal.m4 | 1109 --
newlib/libc/machine/riscv/configure | 4942 ------
newlib/libc/machine/riscv/configure.ac | 13 -
newlib/libc/machine/rl78/Makefile.am | 3 -
newlib/libc/machine/rl78/Makefile.in | 152 +-
newlib/libc/machine/rl78/aclocal.m4 | 1109 --
newlib/libc/machine/rl78/configure | 4942 ------
newlib/libc/machine/rl78/configure.ac | 13 -
newlib/libc/machine/rx/Makefile.am | 3 -
newlib/libc/machine/rx/Makefile.in | 152 +-
newlib/libc/machine/rx/aclocal.m4 | 1109 --
newlib/libc/machine/rx/configure | 4942 ------
newlib/libc/machine/rx/configure.ac | 13 -
newlib/libc/machine/sh/Makefile.am | 3 -
newlib/libc/machine/sh/Makefile.in | 146 +-
newlib/libc/machine/sh/acinclude.m4 | 9 +
newlib/libc/machine/sh/aclocal.m4 | 1173 --
newlib/libc/machine/sh/configure | 6030 --------
newlib/libc/machine/sh/configure.ac | 20 -
newlib/libc/machine/sparc/Makefile.am | 3 -
newlib/libc/machine/sparc/Makefile.in | 159 +-
newlib/libc/machine/sparc/aclocal.m4 | 1109 --
newlib/libc/machine/sparc/configure | 4942 ------
newlib/libc/machine/sparc/configure.ac | 13 -
newlib/libc/machine/spu/Makefile.am | 4 -
newlib/libc/machine/spu/Makefile.in | 153 +-
newlib/libc/machine/spu/acinclude.m4 | 10 +
newlib/libc/machine/spu/aclocal.m4 | 1173 --
newlib/libc/machine/spu/configure | 6034 --------
newlib/libc/machine/spu/configure.ac | 22 -
newlib/libc/machine/tic4x/Makefile.am | 3 -
newlib/libc/machine/tic4x/Makefile.in | 152 +-
newlib/libc/machine/tic4x/aclocal.m4 | 1109 --
newlib/libc/machine/tic4x/configure | 4942 ------
newlib/libc/machine/tic4x/configure.ac | 13 -
newlib/libc/machine/tic6x/Makefile.am | 3 -
newlib/libc/machine/tic6x/Makefile.in | 152 +-
newlib/libc/machine/tic6x/aclocal.m4 | 1109 --
newlib/libc/machine/tic6x/configure | 4942 ------
newlib/libc/machine/tic6x/configure.ac | 13 -
newlib/libc/machine/tic80/Makefile.am | 3 -
newlib/libc/machine/tic80/Makefile.in | 152 +-
newlib/libc/machine/tic80/aclocal.m4 | 1109 --
newlib/libc/machine/tic80/configure | 4942 ------
newlib/libc/machine/tic80/configure.ac | 13 -
newlib/libc/machine/v850/Makefile.am | 3 -
newlib/libc/machine/v850/Makefile.in | 152 +-
newlib/libc/machine/v850/aclocal.m4 | 1109 --
newlib/libc/machine/v850/configure | 4942 ------
newlib/libc/machine/v850/configure.ac | 13 -
newlib/libc/machine/visium/Makefile.am | 3 -
newlib/libc/machine/visium/Makefile.in | 159 +-
newlib/libc/machine/visium/aclocal.m4 | 1109 --
newlib/libc/machine/visium/configure | 4942 ------
newlib/libc/machine/visium/configure.ac | 13 -
newlib/libc/machine/w65/Makefile.am | 3 -
newlib/libc/machine/w65/Makefile.in | 159 +-
newlib/libc/machine/w65/aclocal.m4 | 1109 --
newlib/libc/machine/w65/configure | 4942 ------
newlib/libc/machine/w65/configure.ac | 13 -
newlib/libc/machine/x86_64/Makefile.am | 3 -
newlib/libc/machine/x86_64/Makefile.in | 152 +-
newlib/libc/machine/x86_64/aclocal.m4 | 1109 --
newlib/libc/machine/x86_64/configure | 4942 ------
newlib/libc/machine/x86_64/configure.ac | 13 -
newlib/libc/machine/xc16x/Makefile.am | 3 -
newlib/libc/machine/xc16x/Makefile.in | 159 +-
newlib/libc/machine/xc16x/aclocal.m4 | 1109 --
newlib/libc/machine/xc16x/configure | 4942 ------
newlib/libc/machine/xc16x/configure.ac | 13 -
newlib/libc/machine/xscale/Makefile.am | 3 -
newlib/libc/machine/xscale/aclocal.m4 | 1109 --
newlib/libc/machine/xscale/configure | 4942 ------
newlib/libc/machine/xscale/configure.ac | 13 -
newlib/libc/machine/xstormy16/Makefile.am | 4 -
newlib/libc/machine/xstormy16/Makefile.in | 152 +-
newlib/libc/machine/xstormy16/aclocal.m4 | 1109 --
newlib/libc/machine/xstormy16/configure | 4942 ------
newlib/libc/machine/xstormy16/configure.ac | 13 -
newlib/libc/machine/z8k/Makefile.am | 3 -
newlib/libc/machine/z8k/Makefile.in | 152 +-
newlib/libc/machine/z8k/aclocal.m4 | 1109 --
newlib/libc/machine/z8k/configure | 4942 ------
newlib/libc/machine/z8k/configure.ac | 13 -
newlib/libc/misc/Makefile.in | 7 +-
newlib/libc/posix/Makefile.in | 7 +-
newlib/libc/reent/Makefile.in | 7 +-
newlib/libc/search/Makefile.in | 7 +-
newlib/libc/signal/Makefile.in | 7 +-
newlib/libc/ssp/Makefile.in | 7 +-
newlib/libc/stdio/Makefile.in | 7 +-
newlib/libc/stdio64/Makefile.in | 7 +-
newlib/libc/stdlib/Makefile.in | 7 +-
newlib/libc/string/Makefile.in | 7 +-
newlib/libc/sys/a29khif/Makefile.in | 7 +-
newlib/libc/sys/amdgcn/Makefile.in | 7 +-
newlib/libc/sys/arm/Makefile.in | 7 +-
newlib/libc/sys/d10v/Makefile.in | 7 +-
newlib/libc/sys/decstation/Makefile.in | 7 +-
newlib/libc/sys/epiphany/Makefile.in | 7 +-
newlib/libc/sys/h8300hms/Makefile.in | 7 +-
newlib/libc/sys/h8500hms/Makefile.in | 7 +-
newlib/libc/sys/m88kbug/Makefile.in | 7 +-
newlib/libc/sys/mmixware/Makefile.in | 7 +-
newlib/libc/sys/netware/Makefile.in | 7 +-
newlib/libc/sys/or1k/Makefile.in | 7 +-
newlib/libc/sys/rdos/Makefile.in | 7 +-
newlib/libc/sys/rtems/Makefile.in | 7 +-
newlib/libc/sys/sh/Makefile.in | 7 +-
newlib/libc/sys/sparc64/Makefile.in | 7 +-
newlib/libc/sys/sun4/Makefile.in | 7 +-
newlib/libc/sys/sysmec/Makefile.in | 7 +-
newlib/libc/sys/sysnec810/Makefile.in | 7 +-
newlib/libc/sys/sysnecv850/Makefile.in | 7 +-
newlib/libc/sys/sysvi386/Makefile.in | 7 +-
newlib/libc/sys/sysvnecv70/Makefile.in | 7 +-
newlib/libc/sys/tic80/Makefile.in | 7 +-
newlib/libc/sys/tirtos/Makefile.in | 7 +-
newlib/libc/sys/w65/Makefile.in | 7 +-
newlib/libc/sys/z8ksim/Makefile.in | 7 +-
newlib/libc/syscalls/Makefile.in | 7 +-
newlib/libc/time/Makefile.in | 7 +-
newlib/libc/unix/Makefile.in | 7 +-
newlib/libc/xdr/Makefile.in | 7 +-
355 files changed, 6795 insertions(+), 380098 deletions(-)
delete mode 100644 newlib/libc/machine/a29k/aclocal.m4
delete mode 100755 newlib/libc/machine/a29k/configure
delete mode 100644 newlib/libc/machine/a29k/configure.ac
delete mode 100644 newlib/libc/machine/aarch64/aclocal.m4
delete mode 100755 newlib/libc/machine/aarch64/configure
delete mode 100644 newlib/libc/machine/aarch64/configure.ac
delete mode 100644 newlib/libc/machine/amdgcn/aclocal.m4
delete mode 100755 newlib/libc/machine/amdgcn/configure
delete mode 100644 newlib/libc/machine/amdgcn/configure.ac
delete mode 100644 newlib/libc/machine/arc/aclocal.m4
delete mode 100755 newlib/libc/machine/arc/configure
delete mode 100644 newlib/libc/machine/arc/configure.ac
delete mode 100644 newlib/libc/machine/arm/aclocal.m4
delete mode 100755 newlib/libc/machine/arm/configure
delete mode 100644 newlib/libc/machine/arm/configure.ac
delete mode 100644 newlib/libc/machine/bfin/aclocal.m4
delete mode 100755 newlib/libc/machine/bfin/configure
delete mode 100644 newlib/libc/machine/bfin/configure.ac
delete mode 100644 newlib/libc/machine/cr16/aclocal.m4
delete mode 100644 newlib/libc/machine/cr16/configure
delete mode 100644 newlib/libc/machine/cr16/configure.ac
delete mode 100644 newlib/libc/machine/cris/aclocal.m4
delete mode 100755 newlib/libc/machine/cris/configure
delete mode 100644 newlib/libc/machine/cris/configure.ac
delete mode 100644 newlib/libc/machine/crx/aclocal.m4
delete mode 100755 newlib/libc/machine/crx/configure
delete mode 100644 newlib/libc/machine/crx/configure.ac
delete mode 100644 newlib/libc/machine/csky/aclocal.m4
delete mode 100755 newlib/libc/machine/csky/configure
delete mode 100644 newlib/libc/machine/csky/configure.ac
delete mode 100644 newlib/libc/machine/d10v/aclocal.m4
delete mode 100755 newlib/libc/machine/d10v/configure
delete mode 100644 newlib/libc/machine/d10v/configure.ac
delete mode 100644 newlib/libc/machine/d30v/aclocal.m4
delete mode 100755 newlib/libc/machine/d30v/configure
delete mode 100644 newlib/libc/machine/d30v/configure.ac
delete mode 100644 newlib/libc/machine/epiphany/aclocal.m4
delete mode 100755 newlib/libc/machine/epiphany/configure
delete mode 100644 newlib/libc/machine/epiphany/configure.ac
delete mode 100644 newlib/libc/machine/fr30/aclocal.m4
delete mode 100755 newlib/libc/machine/fr30/configure
delete mode 100644 newlib/libc/machine/fr30/configure.ac
delete mode 100644 newlib/libc/machine/frv/aclocal.m4
delete mode 100755 newlib/libc/machine/frv/configure
delete mode 100644 newlib/libc/machine/frv/configure.ac
delete mode 100644 newlib/libc/machine/ft32/aclocal.m4
delete mode 100755 newlib/libc/machine/ft32/configure
delete mode 100644 newlib/libc/machine/ft32/configure.ac
delete mode 100644 newlib/libc/machine/h8300/aclocal.m4
delete mode 100755 newlib/libc/machine/h8300/configure
delete mode 100644 newlib/libc/machine/h8300/configure.ac
delete mode 100644 newlib/libc/machine/h8500/aclocal.m4
delete mode 100755 newlib/libc/machine/h8500/configure
delete mode 100644 newlib/libc/machine/h8500/configure.ac
delete mode 100644 newlib/libc/machine/hppa/aclocal.m4
delete mode 100755 newlib/libc/machine/hppa/configure
delete mode 100644 newlib/libc/machine/hppa/configure.ac
delete mode 100644 newlib/libc/machine/i386/aclocal.m4
delete mode 100755 newlib/libc/machine/i386/configure
delete mode 100644 newlib/libc/machine/i386/configure.ac
delete mode 100644 newlib/libc/machine/i960/aclocal.m4
delete mode 100755 newlib/libc/machine/i960/configure
delete mode 100644 newlib/libc/machine/i960/configure.ac
delete mode 100644 newlib/libc/machine/iq2000/aclocal.m4
delete mode 100755 newlib/libc/machine/iq2000/configure
delete mode 100644 newlib/libc/machine/iq2000/configure.ac
delete mode 100644 newlib/libc/machine/lm32/aclocal.m4
delete mode 100755 newlib/libc/machine/lm32/configure
delete mode 100644 newlib/libc/machine/lm32/configure.ac
delete mode 100644 newlib/libc/machine/m32c/aclocal.m4
delete mode 100755 newlib/libc/machine/m32c/configure
delete mode 100644 newlib/libc/machine/m32c/configure.ac
delete mode 100644 newlib/libc/machine/m32r/aclocal.m4
delete mode 100755 newlib/libc/machine/m32r/configure
delete mode 100644 newlib/libc/machine/m32r/configure.ac
delete mode 100644 newlib/libc/machine/m68hc11/aclocal.m4
delete mode 100755 newlib/libc/machine/m68hc11/configure
delete mode 100644 newlib/libc/machine/m68hc11/configure.ac
delete mode 100644 newlib/libc/machine/m68k/aclocal.m4
delete mode 100755 newlib/libc/machine/m68k/configure
delete mode 100644 newlib/libc/machine/m68k/configure.ac
delete mode 100644 newlib/libc/machine/m88k/aclocal.m4
delete mode 100755 newlib/libc/machine/m88k/configure
delete mode 100644 newlib/libc/machine/m88k/configure.ac
delete mode 100644 newlib/libc/machine/mep/aclocal.m4
delete mode 100755 newlib/libc/machine/mep/configure
delete mode 100644 newlib/libc/machine/mep/configure.ac
delete mode 100644 newlib/libc/machine/microblaze/aclocal.m4
delete mode 100644 newlib/libc/machine/microblaze/configure
delete mode 100644 newlib/libc/machine/microblaze/configure.ac
delete mode 100644 newlib/libc/machine/mips/aclocal.m4
delete mode 100755 newlib/libc/machine/mips/configure
delete mode 100644 newlib/libc/machine/mips/configure.ac
delete mode 100644 newlib/libc/machine/mn10200/aclocal.m4
delete mode 100755 newlib/libc/machine/mn10200/configure
delete mode 100644 newlib/libc/machine/mn10200/configure.ac
delete mode 100644 newlib/libc/machine/mn10300/aclocal.m4
delete mode 100755 newlib/libc/machine/mn10300/configure
delete mode 100644 newlib/libc/machine/mn10300/configure.ac
delete mode 100644 newlib/libc/machine/moxie/aclocal.m4
delete mode 100644 newlib/libc/machine/moxie/configure
delete mode 100644 newlib/libc/machine/moxie/configure.ac
delete mode 100644 newlib/libc/machine/msp430/aclocal.m4
delete mode 100755 newlib/libc/machine/msp430/configure
delete mode 100644 newlib/libc/machine/msp430/configure.ac
delete mode 100644 newlib/libc/machine/mt/aclocal.m4
delete mode 100755 newlib/libc/machine/mt/configure
delete mode 100644 newlib/libc/machine/mt/configure.ac
create mode 100644 newlib/libc/machine/nds32/acinclude.m4
delete mode 100644 newlib/libc/machine/nds32/aclocal.m4
delete mode 100755 newlib/libc/machine/nds32/configure
delete mode 100644 newlib/libc/machine/nds32/configure.ac
delete mode 100644 newlib/libc/machine/necv70/aclocal.m4
delete mode 100755 newlib/libc/machine/necv70/configure
delete mode 100644 newlib/libc/machine/necv70/configure.ac
delete mode 100644 newlib/libc/machine/nios2/aclocal.m4
delete mode 100755 newlib/libc/machine/nios2/configure
delete mode 100644 newlib/libc/machine/nios2/configure.ac
delete mode 100644 newlib/libc/machine/nvptx/aclocal.m4
delete mode 100644 newlib/libc/machine/nvptx/configure
delete mode 100644 newlib/libc/machine/nvptx/configure.ac
delete mode 100644 newlib/libc/machine/or1k/aclocal.m4
delete mode 100755 newlib/libc/machine/or1k/configure
delete mode 100644 newlib/libc/machine/or1k/configure.ac
create mode 100644 newlib/libc/machine/powerpc/acinclude.m4
delete mode 100644 newlib/libc/machine/powerpc/aclocal.m4
delete mode 100755 newlib/libc/machine/powerpc/configure
delete mode 100644 newlib/libc/machine/powerpc/configure.ac
delete mode 100644 newlib/libc/machine/pru/aclocal.m4
delete mode 100755 newlib/libc/machine/pru/configure
delete mode 100644 newlib/libc/machine/pru/configure.ac
delete mode 100644 newlib/libc/machine/riscv/aclocal.m4
delete mode 100755 newlib/libc/machine/riscv/configure
delete mode 100644 newlib/libc/machine/riscv/configure.ac
delete mode 100644 newlib/libc/machine/rl78/aclocal.m4
delete mode 100755 newlib/libc/machine/rl78/configure
delete mode 100644 newlib/libc/machine/rl78/configure.ac
delete mode 100644 newlib/libc/machine/rx/aclocal.m4
delete mode 100755 newlib/libc/machine/rx/configure
delete mode 100644 newlib/libc/machine/rx/configure.ac
create mode 100644 newlib/libc/machine/sh/acinclude.m4
delete mode 100644 newlib/libc/machine/sh/aclocal.m4
delete mode 100755 newlib/libc/machine/sh/configure
delete mode 100644 newlib/libc/machine/sh/configure.ac
delete mode 100644 newlib/libc/machine/sparc/aclocal.m4
delete mode 100755 newlib/libc/machine/sparc/configure
delete mode 100644 newlib/libc/machine/sparc/configure.ac
create mode 100644 newlib/libc/machine/spu/acinclude.m4
delete mode 100644 newlib/libc/machine/spu/aclocal.m4
delete mode 100644 newlib/libc/machine/spu/configure
delete mode 100644 newlib/libc/machine/spu/configure.ac
delete mode 100644 newlib/libc/machine/tic4x/aclocal.m4
delete mode 100755 newlib/libc/machine/tic4x/configure
delete mode 100644 newlib/libc/machine/tic4x/configure.ac
delete mode 100644 newlib/libc/machine/tic6x/aclocal.m4
delete mode 100755 newlib/libc/machine/tic6x/configure
delete mode 100644 newlib/libc/machine/tic6x/configure.ac
delete mode 100644 newlib/libc/machine/tic80/aclocal.m4
delete mode 100755 newlib/libc/machine/tic80/configure
delete mode 100644 newlib/libc/machine/tic80/configure.ac
delete mode 100644 newlib/libc/machine/v850/aclocal.m4
delete mode 100755 newlib/libc/machine/v850/configure
delete mode 100644 newlib/libc/machine/v850/configure.ac
delete mode 100644 newlib/libc/machine/visium/aclocal.m4
delete mode 100755 newlib/libc/machine/visium/configure
delete mode 100644 newlib/libc/machine/visium/configure.ac
delete mode 100644 newlib/libc/machine/w65/aclocal.m4
delete mode 100755 newlib/libc/machine/w65/configure
delete mode 100644 newlib/libc/machine/w65/configure.ac
delete mode 100644 newlib/libc/machine/x86_64/aclocal.m4
delete mode 100755 newlib/libc/machine/x86_64/configure
delete mode 100644 newlib/libc/machine/x86_64/configure.ac
delete mode 100644 newlib/libc/machine/xc16x/aclocal.m4
delete mode 100644 newlib/libc/machine/xc16x/configure
delete mode 100644 newlib/libc/machine/xc16x/configure.ac
delete mode 100644 newlib/libc/machine/xscale/aclocal.m4
delete mode 100755 newlib/libc/machine/xscale/configure
delete mode 100644 newlib/libc/machine/xscale/configure.ac
delete mode 100644 newlib/libc/machine/xstormy16/aclocal.m4
delete mode 100755 newlib/libc/machine/xstormy16/configure
delete mode 100644 newlib/libc/machine/xstormy16/configure.ac
delete mode 100644 newlib/libc/machine/z8k/aclocal.m4
delete mode 100755 newlib/libc/machine/z8k/configure
delete mode 100644 newlib/libc/machine/z8k/configure.ac
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 436dd4070ec8..5d4dc7bf5600 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -215,68 +215,75 @@ AM_CONDITIONAL(HAVE_LONG_DOUBLE, test x"$ac_cv_type_long_double" = x"yes")
dnl iconv library will be compiled if --enable-newlib-iconv option is enabled
AM_CONDITIONAL(ENABLE_NEWLIB_ICONV, test x${newlib_iconv} != x)
+dnl We have to include these unconditionally since machines might want to use
+dnl AM_CONDITIONAL in their subdirs.
+m4_include([machine/nds32/acinclude.m4])
+m4_include([machine/powerpc/acinclude.m4])
+m4_include([machine/sh/acinclude.m4])
+m4_include([machine/spu/acinclude.m4])
+
LIBC_MACHINE_LIB=
if test -n "${machine_dir}"; then
case ${machine_dir} in
- a29k) AC_CONFIG_SUBDIRS(machine/a29k) ;;
- aarch64) AC_CONFIG_SUBDIRS(machine/aarch64) ;;
- amdgcn) AC_CONFIG_SUBDIRS(machine/amdgcn) ;;
- arc) AC_CONFIG_SUBDIRS(machine/arc) ;;
- arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
- bfin) AC_CONFIG_SUBDIRS(machine/bfin) ;;
- cr16) AC_CONFIG_SUBDIRS(machine/cr16) ;;
- cris) AC_CONFIG_SUBDIRS(machine/cris) ;;
- crx) AC_CONFIG_SUBDIRS(machine/crx) ;;
- csky) AC_CONFIG_SUBDIRS(machine/csky) ;;
- d10v) AC_CONFIG_SUBDIRS(machine/d10v) ;;
- d30v) AC_CONFIG_SUBDIRS(machine/d30v) ;;
- epiphany) AC_CONFIG_SUBDIRS(machine/epiphany) ;;
- fr30) AC_CONFIG_SUBDIRS(machine/fr30) ;;
- frv) AC_CONFIG_SUBDIRS(machine/frv) ;;
- ft32) AC_CONFIG_SUBDIRS(machine/ft32) ;;
- h8300) AC_CONFIG_SUBDIRS(machine/h8300) ;;
- h8500) AC_CONFIG_SUBDIRS(machine/h8500) ;;
- hppa) AC_CONFIG_SUBDIRS(machine/hppa) ;;
- i386) AC_CONFIG_SUBDIRS(machine/i386) ;;
- i960) AC_CONFIG_SUBDIRS(machine/i960) ;;
- iq2000) AC_CONFIG_SUBDIRS(machine/iq2000) ;;
- lm32) AC_CONFIG_SUBDIRS(machine/lm32) ;;
- m32c) AC_CONFIG_SUBDIRS(machine/m32c) ;;
- m32r) AC_CONFIG_SUBDIRS(machine/m32r) ;;
- m68hc11) AC_CONFIG_SUBDIRS(machine/m68hc11) ;;
- m68k) AC_CONFIG_SUBDIRS(machine/m68k) ;;
- m88k) AC_CONFIG_SUBDIRS(machine/m88k) ;;
- mep) AC_CONFIG_SUBDIRS(machine/mep) ;;
- microblaze) AC_CONFIG_SUBDIRS(machine/microblaze) ;;
- mips) AC_CONFIG_SUBDIRS(machine/mips) ;;
- riscv) AC_CONFIG_SUBDIRS(machine/riscv) ;;
- mn10200) AC_CONFIG_SUBDIRS(machine/mn10200) ;;
- mn10300) AC_CONFIG_SUBDIRS(machine/mn10300) ;;
- moxie) AC_CONFIG_SUBDIRS(machine/moxie) ;;
- msp430) AC_CONFIG_SUBDIRS(machine/msp430) ;;
- mt) AC_CONFIG_SUBDIRS(machine/mt) ;;
- nds32) AC_CONFIG_SUBDIRS(machine/nds32) ;;
- necv70) AC_CONFIG_SUBDIRS(machine/necv70) ;;
- nios2) AC_CONFIG_SUBDIRS(machine/nios2) ;;
- nvptx) AC_CONFIG_SUBDIRS(machine/nvptx) ;;
- or1k) AC_CONFIG_SUBDIRS(machine/or1k) ;;
- powerpc) AC_CONFIG_SUBDIRS(machine/powerpc) ;;
- pru) AC_CONFIG_SUBDIRS(machine/pru) ;;
- rl78) AC_CONFIG_SUBDIRS(machine/rl78) ;;
- rx) AC_CONFIG_SUBDIRS(machine/rx) ;;
- sh) AC_CONFIG_SUBDIRS(machine/sh) ;;
- sparc) AC_CONFIG_SUBDIRS(machine/sparc) ;;
- spu) AC_CONFIG_SUBDIRS(machine/spu) ;;
- tic4x) AC_CONFIG_SUBDIRS(machine/tic4x) ;;
- tic6x) AC_CONFIG_SUBDIRS(machine/tic6x) ;;
- tic80) AC_CONFIG_SUBDIRS(machine/tic80) ;;
- v850) AC_CONFIG_SUBDIRS(machine/v850) ;;
- visium) AC_CONFIG_SUBDIRS(machine/visium) ;;
- w65) AC_CONFIG_SUBDIRS(machine/w65) ;;
- x86_64) AC_CONFIG_SUBDIRS(machine/x86_64) ;;
- xc16x) AC_CONFIG_SUBDIRS(machine/xc16x) ;;
- xstormy16) AC_CONFIG_SUBDIRS(machine/xstormy16) ;;
- z8k) AC_CONFIG_SUBDIRS(machine/z8k) ;;
+ a29k) AC_CONFIG_FILES([machine/a29k/Makefile]) ;;
+ aarch64) AC_CONFIG_FILES([machine/aarch64/Makefile]) ;;
+ amdgcn) AC_CONFIG_FILES([machine/amdgcn/Makefile]) ;;
+ arc) AC_CONFIG_FILES([machine/arc/Makefile]) ;;
+ arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
+ bfin) AC_CONFIG_FILES([machine/bfin/Makefile]) ;;
+ cr16) AC_CONFIG_FILES([machine/cr16/Makefile]) ;;
+ cris) AC_CONFIG_FILES([machine/cris/Makefile]) ;;
+ crx) AC_CONFIG_FILES([machine/crx/Makefile]) ;;
+ csky) AC_CONFIG_FILES([machine/csky/Makefile]) ;;
+ d10v) AC_CONFIG_FILES([machine/d10v/Makefile]) ;;
+ d30v) AC_CONFIG_FILES([machine/d30v/Makefile]) ;;
+ epiphany) AC_CONFIG_FILES([machine/epiphany/Makefile]) ;;
+ fr30) AC_CONFIG_FILES([machine/fr30/Makefile]) ;;
+ frv) AC_CONFIG_FILES([machine/frv/Makefile]) ;;
+ ft32) AC_CONFIG_FILES([machine/ft32/Makefile]) ;;
+ h8300) AC_CONFIG_FILES([machine/h8300/Makefile]) ;;
+ h8500) AC_CONFIG_FILES([machine/h8500/Makefile]) ;;
+ hppa) AC_CONFIG_FILES([machine/hppa/Makefile]) ;;
+ i386) AC_CONFIG_FILES([machine/i386/Makefile]) ;;
+ i960) AC_CONFIG_FILES([machine/i960/Makefile]) ;;
+ iq2000) AC_CONFIG_FILES([machine/iq2000/Makefile]) ;;
+ lm32) AC_CONFIG_FILES([machine/lm32/Makefile]) ;;
+ m32c) AC_CONFIG_FILES([machine/m32c/Makefile]) ;;
+ m32r) AC_CONFIG_FILES([machine/m32r/Makefile]) ;;
+ m68hc11) AC_CONFIG_FILES([machine/m68hc11/Makefile]) ;;
+ m68k) AC_CONFIG_FILES([machine/m68k/Makefile]) ;;
+ m88k) AC_CONFIG_FILES([machine/m88k/Makefile]) ;;
+ mep) AC_CONFIG_FILES([machine/mep/Makefile]) ;;
+ microblaze) AC_CONFIG_FILES([machine/microblaze/Makefile]) ;;
+ mips) AC_CONFIG_FILES([machine/mips/Makefile]) ;;
+ riscv) AC_CONFIG_FILES([machine/riscv/Makefile]) ;;
+ mn10200) AC_CONFIG_FILES([machine/mn10200/Makefile]) ;;
+ mn10300) AC_CONFIG_FILES([machine/mn10300/Makefile]) ;;
+ moxie) AC_CONFIG_FILES([machine/moxie/Makefile]) ;;
+ msp430) AC_CONFIG_FILES([machine/msp430/Makefile]) ;;
+ mt) AC_CONFIG_FILES([machine/mt/Makefile]) ;;
+ nds32) AC_CONFIG_FILES([machine/nds32/Makefile]) ;;
+ necv70) AC_CONFIG_FILES([machine/necv70/Makefile]) ;;
+ nios2) AC_CONFIG_FILES([machine/nios2/Makefile]) ;;
+ nvptx) AC_CONFIG_FILES([machine/nvptx/Makefile]) ;;
+ or1k) AC_CONFIG_FILES([machine/or1k/Makefile]) ;;
+ powerpc) AC_CONFIG_FILES([machine/powerpc/Makefile]) ;;
+ pru) AC_CONFIG_FILES([machine/pru/Makefile]) ;;
+ rl78) AC_CONFIG_FILES([machine/rl78/Makefile]) ;;
+ rx) AC_CONFIG_FILES([machine/rx/Makefile]) ;;
+ sh) AC_CONFIG_FILES([machine/sh/Makefile]) ;;
+ sparc) AC_CONFIG_FILES([machine/sparc/Makefile]) ;;
+ spu) AC_CONFIG_FILES([machine/spu/Makefile]) ;;
+ tic4x) AC_CONFIG_FILES([machine/tic4x/Makefile]) ;;
+ tic6x) AC_CONFIG_FILES([machine/tic6x/Makefile]) ;;
+ tic80) AC_CONFIG_FILES([machine/tic80/Makefile]) ;;
+ v850) AC_CONFIG_FILES([machine/v850/Makefile]) ;;
+ visium) AC_CONFIG_FILES([machine/visium/Makefile]) ;;
+ w65) AC_CONFIG_FILES([machine/w65/Makefile]) ;;
+ x86_64) AC_CONFIG_FILES([machine/x86_64/Makefile]) ;;
+ xc16x) AC_CONFIG_FILES([machine/xc16x/Makefile]) ;;
+ xstormy16) AC_CONFIG_FILES([machine/xstormy16/Makefile]) ;;
+ z8k) AC_CONFIG_FILES([machine/z8k/Makefile]) ;;
*) AC_MSG_ERROR([unsupported machine_dir "${machine_dir}"]) ;;
esac
@@ -293,5 +300,7 @@ AC_SUBST(LIBC_MACHINE_LIB)
AC_SUBST(machine_dir)
AC_SUBST(shared_machine_dir)
+AM_CONDITIONAL(MACH_ADD_SETJMP, test "x$mach_add_setjmp" = "xtrue")
+
AC_CONFIG_FILES([Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile ssp/Makefile xdr/Makefile])
AC_OUTPUT
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index bba8db2431b1..ccd649fe9d68 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -98,7 +98,12 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/../../lt~obsolete.m4 \
- $(top_srcdir)/../acinclude.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/../acinclude.m4 \
+ $(top_srcdir)/machine/nds32/acinclude.m4 \
+ $(top_srcdir)/machine/powerpc/acinclude.m4 \
+ $(top_srcdir)/machine/sh/acinclude.m4 \
+ $(top_srcdir)/machine/spu/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am
diff --git a/newlib/libc/machine/a29k/Makefile.am b/newlib/libc/machine/a29k/Makefile.am
index 768c7078f6bf..74820dd030ed 100644
--- a/newlib/libc/machine/a29k/Makefile.am
+++ b/newlib/libc/machine/a29k/Makefile.am
@@ -7,6 +7,3 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES =
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/aarch64/Makefile.am b/newlib/libc/machine/aarch64/Makefile.am
index ad93352cc9ec..d13fb9674968 100644
--- a/newlib/libc/machine/aarch64/Makefile.am
+++ b/newlib/libc/machine/aarch64/Makefile.am
@@ -40,6 +40,3 @@ lib_a_SOURCES += strrchr-stub.c
lib_a_SOURCES += strrchr.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/amdgcn/Makefile.am b/newlib/libc/machine/amdgcn/Makefile.am
index 1999d86e4393..756d1205c862 100644
--- a/newlib/libc/machine/amdgcn/Makefile.am
+++ b/newlib/libc/machine/amdgcn/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = abort.c exit.c atexit.c malloc_support.c getreent.c signal.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/arc/Makefile.am b/newlib/libc/machine/arc/Makefile.am
index 6acf725e427f..5f1ba44cca22 100644
--- a/newlib/libc/machine/arc/Makefile.am
+++ b/newlib/libc/machine/arc/Makefile.am
@@ -38,8 +38,5 @@ lib_a_SOURCES = \
lib_a_CFLAGS = $(AM_CFLAGS)
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
pdf:
install-pdf:
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 484037297ee3..13d001cb6e03 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -19,9 +19,6 @@ lib_a_SOURCES += strlen.S
lib_a_CFLAGS = $(AM_CFLAGS)
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
MEMCHR_DEP=acle-compat.h
MEMCPY_DEP=memcpy-armv7a.S memcpy-armv7m.S
STRCMP_DEP=strcmp-arm-tiny.S strcmp-armv4.S strcmp-armv4t.S strcmp-armv6.S \
diff --git a/newlib/libc/machine/bfin/Makefile.am b/newlib/libc/machine/bfin/Makefile.am
index 70e6ddf9bd57..c02a8e7cc1ed 100644
--- a/newlib/libc/machine/bfin/Makefile.am
+++ b/newlib/libc/machine/bfin/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S longjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/cr16/Makefile.am b/newlib/libc/machine/cr16/Makefile.am
index 42fea14edee2..8333419d5cf4 100644
--- a/newlib/libc/machine/cr16/Makefile.am
+++ b/newlib/libc/machine/cr16/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S getenv.c
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
index 17da1618b590..62bb46e98eb8 100644
--- a/newlib/libc/machine/cris/Makefile.am
+++ b/newlib/libc/machine/cris/Makefile.am
@@ -19,6 +19,3 @@ libic_a_CCASFLAGS=$(AM_CCASFLAGS)
libic_a_CFLAGS=$(AM_CFLAGS)
tooldir = $(exec_prefix)/$(host_alias)
toollibdir = $(tooldir)/lib$(MULTISUBDIR)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
index 42fea14edee2..8333419d5cf4 100644
--- a/newlib/libc/machine/crx/Makefile.am
+++ b/newlib/libc/machine/crx/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S getenv.c
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/csky/Makefile.am b/newlib/libc/machine/csky/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/csky/Makefile.am
+++ b/newlib/libc/machine/csky/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/d10v/Makefile.am b/newlib/libc/machine/d10v/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/d10v/Makefile.am
+++ b/newlib/libc/machine/d10v/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/d30v/Makefile.am b/newlib/libc/machine/d30v/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/d30v/Makefile.am
+++ b/newlib/libc/machine/d30v/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/epiphany/Makefile.am b/newlib/libc/machine/epiphany/Makefile.am
index 80dc99588261..5ad22a1d6dc6 100644
--- a/newlib/libc/machine/epiphany/Makefile.am
+++ b/newlib/libc/machine/epiphany/Makefile.am
@@ -34,6 +34,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/fr30/Makefile.am b/newlib/libc/machine/fr30/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/fr30/Makefile.am
+++ b/newlib/libc/machine/fr30/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/frv/Makefile.am
+++ b/newlib/libc/machine/frv/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/ft32/Makefile.am b/newlib/libc/machine/ft32/Makefile.am
index 23859eda5826..3a4882686190 100644
--- a/newlib/libc/machine/ft32/Makefile.am
+++ b/newlib/libc/machine/ft32/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strlen.S memcpy.S strcmp.S memset.S strcpy.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index 3a56ced81bba..7e0dba80068d 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S \
lib_a_LIBADD =
lib_a_DEPENDENCIES =
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/h8500/Makefile.am b/newlib/libc/machine/h8500/Makefile.am
index 4338e7ed6ff3..9ff139f07958 100644
--- a/newlib/libc/machine/h8500/Makefile.am
+++ b/newlib/libc/machine/h8500/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = divsi3.c mulsi3.c divhi3.S shifts.c cmpsi.c psi.S setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/hppa/Makefile.am b/newlib/libc/machine/hppa/Makefile.am
index f81166f71c6d..11a29116a9c0 100644
--- a/newlib/libc/machine/hppa/Makefile.am
+++ b/newlib/libc/machine/hppa/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = \
memchr.S memcmp.S memcpy.S memset.S setjmp.S strcat.S strcmp.S \
strcpy.S strlen.S strncat.S strncmp.S strncpy.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 726f688e1b9e..8b851f5ace55 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -31,6 +31,3 @@ noinst_DATA =
endif # USE_LIBTOOL
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/i960/Makefile.am b/newlib/libc/machine/i960/Makefile.am
index 84a375b091a7..c542e1285ded 100644
--- a/newlib/libc/machine/i960/Makefile.am
+++ b/newlib/libc/machine/i960/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES =
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ b/newlib/libc/machine/iq2000/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/lm32/Makefile.am b/newlib/libc/machine/lm32/Makefile.am
index a775273c7e99..84e1efe4e80e 100644
--- a/newlib/libc/machine/lm32/Makefile.am
+++ b/newlib/libc/machine/lm32/Makefile.am
@@ -8,7 +8,3 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/m32c/Makefile.am
+++ b/newlib/libc/machine/m32c/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m32r/Makefile.am b/newlib/libc/machine/m32r/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/m32r/Makefile.am
+++ b/newlib/libc/machine/m32r/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ b/newlib/libc/machine/m68hc11/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m68k/Makefile.am b/newlib/libc/machine/m68k/Makefile.am
index 80045cd7ae3a..b70b44d03e80 100644
--- a/newlib/libc/machine/m68k/Makefile.am
+++ b/newlib/libc/machine/m68k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strcpy.c strlen.c memcpy.S memset.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m88k/Makefile.am b/newlib/libc/machine/m88k/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/m88k/Makefile.am
+++ b/newlib/libc/machine/m88k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mep/Makefile.am b/newlib/libc/machine/mep/Makefile.am
index 605e1de41a5a..0a25f74d9019 100644
--- a/newlib/libc/machine/mep/Makefile.am
+++ b/newlib/libc/machine/mep/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/microblaze/Makefile.am b/newlib/libc/machine/microblaze/Makefile.am
index ebc35c8b1a67..337cc115537d 100644
--- a/newlib/libc/machine/microblaze/Makefile.am
+++ b/newlib/libc/machine/microblaze/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = strlen.c strcmp.c strcpy.c setjmp.S longjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index 6ef3a2d594f8..2ea05743e25d 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -7,6 +7,3 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S strlen.c strcmp.S strncpy.c memset.S memcpy.S
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mn10200/Makefile.am b/newlib/libc/machine/mn10200/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/mn10200/Makefile.am
+++ b/newlib/libc/machine/mn10200/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mn10300/Makefile.am b/newlib/libc/machine/mn10300/Makefile.am
index 353264adc5dc..dc501d19c460 100644
--- a/newlib/libc/machine/mn10300/Makefile.am
+++ b/newlib/libc/machine/mn10300/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memchr.S memcmp.S memcpy.S memset.S strchr.S \
strcmp.S strcpy.S strlen.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/moxie/Makefile.am b/newlib/libc/machine/moxie/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/moxie/Makefile.am
+++ b/newlib/libc/machine/moxie/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/msp430/Makefile.am b/newlib/libc/machine/msp430/Makefile.am
index 13641f5169e7..8f53099cf220 100644
--- a/newlib/libc/machine/msp430/Makefile.am
+++ b/newlib/libc/machine/msp430/Makefile.am
@@ -28,6 +28,3 @@ lib_a_CFLAGS=$(AM_CFLAGS)
if NEWLIB_NANO_FORMATTED_IO
TINY_SOURCES = tiny-puts.c tiny-printf.c
endif
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/mt/Makefile.am
+++ b/newlib/libc/machine/mt/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/nds32/Makefile.am b/newlib/libc/machine/nds32/Makefile.am
index 40b2a994a2f9..1d559c3b35c0 100644
--- a/newlib/libc/machine/nds32/Makefile.am
+++ b/newlib/libc/machine/nds32/Makefile.am
@@ -12,6 +12,3 @@ else
lib_a_SOURCES = abort.c memcpy.S memset.S setjmp.S strcmp.S strcpy.S
endif
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/nds32/acinclude.m4 b/newlib/libc/machine/nds32/acinclude.m4
new file mode 100644
index 000000000000..35c2afe992bf
--- /dev/null
+++ b/newlib/libc/machine/nds32/acinclude.m4
@@ -0,0 +1,10 @@
+if test "${machine_dir}" = "nds32"; then
+ dnl Use builtin macro to detect if this is for "AndeStar ISA V3m".
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[[#ifdef __NDS32_ISA_V3M__
+# error "This is nds32_isa_v3m."
+#endif
+]])], [is_nds32_isa_v3m="no"], [is_nds32_isa_v3m="yes"])
+fi
+
+AM_CONDITIONAL(IS_NDS32_ISA_V3M, test "$is_nds32_isa_v3m" = "yes")
diff --git a/newlib/libc/machine/necv70/Makefile.am b/newlib/libc/machine/necv70/Makefile.am
index 20dde4ce0440..2507b48d8751 100644
--- a/newlib/libc/machine/necv70/Makefile.am
+++ b/newlib/libc/machine/necv70/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = fastmath.S setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/nios2/Makefile.am b/newlib/libc/machine/nios2/Makefile.am
index aede448ecfc4..219cda97baef 100644
--- a/newlib/libc/machine/nios2/Makefile.am
+++ b/newlib/libc/machine/nios2/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.s
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/nvptx/Makefile.am b/newlib/libc/machine/nvptx/Makefile.am
index ac1ffd989fb7..b019f9cd6fd9 100644
--- a/newlib/libc/machine/nvptx/Makefile.am
+++ b/newlib/libc/machine/nvptx/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = calloc.c callocr.c malloc.c mallocr.c realloc.c reallocr.c \
free.c write.c assert.c puts.c putchar.c printf.c abort.c \
exit.c misc.c clock.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/or1k/Makefile.am b/newlib/libc/machine/or1k/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/or1k/Makefile.am
+++ b/newlib/libc/machine/or1k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index cb046334efff..6e3b391f2028 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -50,12 +50,8 @@ EXTRA_lib_a_SOURCES = \
simdldtoa.c strtosfix16.c strtosfix32.c strtosfix64.c strtoufix16.c \
strtoufix32.c strtoufix64.c ufix64toa.c
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
lib_a-vec_reallocr.o: vec_mallocr.c
$(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECREALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_reallocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c
lib_a-vec_callocr.o: vec_mallocr.c
$(CC) $(DEFS) -DINTERNAL_NEWLIB -DDEFINE_VECCALLOC $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vec_callocr.o `test -f 'vec_mallocr.c' || echo '$(srcdir)/'`vec_mallocr.c
-
diff --git a/newlib/libc/machine/powerpc/acinclude.m4 b/newlib/libc/machine/powerpc/acinclude.m4
new file mode 100644
index 000000000000..7057398e6fa2
--- /dev/null
+++ b/newlib/libc/machine/powerpc/acinclude.m4
@@ -0,0 +1,10 @@
+HAVE_POWERPC_ALTIVEC=no
+HAVE_POWERPC_SPE=no
+if test "${machine_dir}" = "powerpc"; then
+ case $host in
+ powerpc*-*altivec*) HAVE_POWERPC_ALTIVEC=yes ;;
+ powerpc*-*spe*) HAVE_POWERPC_SPE=yes ;;
+ esac
+fi
+AM_CONDITIONAL(HAVE_POWERPC_ALTIVEC, [test "$HAVE_POWERPC_ALTIVEC" = yes])
+AM_CONDITIONAL(HAVE_POWERPC_SPE, [test "$HAVE_POWERPC_SPE" = yes])
diff --git a/newlib/libc/machine/pru/Makefile.am b/newlib/libc/machine/pru/Makefile.am
index aede448ecfc4..219cda97baef 100644
--- a/newlib/libc/machine/pru/Makefile.am
+++ b/newlib/libc/machine/pru/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.s
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/riscv/Makefile.am b/newlib/libc/machine/riscv/Makefile.am
index 388430a6aa18..0e785c09caad 100644
--- a/newlib/libc/machine/riscv/Makefile.am
+++ b/newlib/libc/machine/riscv/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = memmove.S memmove-stub.c memset.S memcpy-asm.S memcpy.c strlen.c \
strcpy.c strcmp.S setjmp.S ieeefp.c ffs.c
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/rl78/Makefile.am b/newlib/libc/machine/rl78/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/rl78/Makefile.am
+++ b/newlib/libc/machine/rl78/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/rx/Makefile.am b/newlib/libc/machine/rx/Makefile.am
index fa327c8aa838..265698e7da90 100644
--- a/newlib/libc/machine/rx/Makefile.am
+++ b/newlib/libc/machine/rx/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = setjmp.S \
strncmp.S strcmp.S strncpy.S strcpy.S strlen.S strcat.S strncat.S \
memset.S mempcpy.S memcpy.S memmove.S memchr.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index a257db91fc4f..a71f1fd47ba6 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -20,6 +20,3 @@ $(lpfx)setjmp.o: asm.h
$(lpfx)strcpy.o: asm.h
$(lpfx)strcmp.o: asm.h
$(lpfx)strncpy.o: asm.h
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/sh/acinclude.m4 b/newlib/libc/machine/sh/acinclude.m4
new file mode 100644
index 000000000000..60af7b1f1135
--- /dev/null
+++ b/newlib/libc/machine/sh/acinclude.m4
@@ -0,0 +1,9 @@
+if test "${machine_dir}" = "sh"; then
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[[#if !defined(__SH5__)
+# error "not SH5"
+#endif
+]])], [have_sh64=yes], [have_sh64=no])
+fi
+
+AM_CONDITIONAL(SH64, [test "$have_sh64" = yes])
diff --git a/newlib/libc/machine/sparc/Makefile.am b/newlib/libc/machine/sparc/Makefile.am
index fe25c43d7c70..11a53f6eae96 100644
--- a/newlib/libc/machine/sparc/Makefile.am
+++ b/newlib/libc/machine/sparc/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = scan.c shuffle.c setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/spu/Makefile.am b/newlib/libc/machine/spu/Makefile.am
index 25ad08c7c203..6189df254567 100644
--- a/newlib/libc/machine/spu/Makefile.am
+++ b/newlib/libc/machine/spu/Makefile.am
@@ -34,7 +34,3 @@ lib_a_SOURCES += calloc_ea.c free_ea.c malloc_ea.c memchr_ea.c memcmp_ea.c \
endif
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
diff --git a/newlib/libc/machine/spu/acinclude.m4 b/newlib/libc/machine/spu/acinclude.m4
new file mode 100644
index 000000000000..4e5fb363ce13
--- /dev/null
+++ b/newlib/libc/machine/spu/acinclude.m4
@@ -0,0 +1,10 @@
+if test "${machine_dir}" = "spu"; then
+ AC_MSG_CHECKING([whether the compiler supports __ea])
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[[#if !defined (__EA32__) && !defined (__EA64__)
+# error "__ea not supported"
+#endif
+]])], [spu_compiler_has_ea=yes], [spu_compiler_has_ea=no])
+ AC_MSG_RESULT($spu_compiler_has_ea)
+fi
+AM_CONDITIONAL(HAVE_SPU_EA, test x${spu_compiler_has_ea} != xno)
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ b/newlib/libc/machine/tic4x/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/tic6x/Makefile.am b/newlib/libc/machine/tic6x/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/tic6x/Makefile.am
+++ b/newlib/libc/machine/tic6x/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/tic80/Makefile.am b/newlib/libc/machine/tic80/Makefile.am
index a181dca4a4cd..667933a4dbf8 100644
--- a/newlib/libc/machine/tic80/Makefile.am
+++ b/newlib/libc/machine/tic80/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/v850/Makefile.am b/newlib/libc/machine/v850/Makefile.am
index 605e1de41a5a..0a25f74d9019 100644
--- a/newlib/libc/machine/v850/Makefile.am
+++ b/newlib/libc/machine/v850/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/visium/Makefile.am b/newlib/libc/machine/visium/Makefile.am
index b9b77d5fe356..5cde6b260327 100644
--- a/newlib/libc/machine/visium/Makefile.am
+++ b/newlib/libc/machine/visium/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = memcpy.c memset.c memmove.c setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/w65/Makefile.am b/newlib/libc/machine/w65/Makefile.am
index 4b0e5d217b10..05499a012337 100644
--- a/newlib/libc/machine/w65/Makefile.am
+++ b/newlib/libc/machine/w65/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = udivhi3.S umodhi3.S smulhi3.S lshrhi.S sdivhi3.S mulsi3.c \
divsi3.c cmpsi.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/x86_64/Makefile.am b/newlib/libc/machine/x86_64/Makefile.am
index 6e914ed9ef6f..c26d4dd637a8 100644
--- a/newlib/libc/machine/x86_64/Makefile.am
+++ b/newlib/libc/machine/x86_64/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memcpy.S memset.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/xc16x/Makefile.am b/newlib/libc/machine/xc16x/Makefile.am
index c27236dd88e4..187d8358a7c4 100644
--- a/newlib/libc/machine/xc16x/Makefile.am
+++ b/newlib/libc/machine/xc16x/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S puts.c putchar.c
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/xscale/Makefile.am b/newlib/libc/machine/xscale/Makefile.am
index 160cb0c1c9d9..913d162d4264 100644
--- a/newlib/libc/machine/xscale/Makefile.am
+++ b/newlib/libc/machine/xscale/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = \
memchr.c memcmp.c memcpy.c memmove.c memset.c \
strchr.c strcmp.c strcpy.c strlen.c setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
index bba941d9d673..b0b72bc0f935 100644
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ b/newlib/libc/machine/xstormy16/Makefile.am
@@ -11,9 +11,6 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
lib_a_LIBADD = $(lpfx)malloc.o \
$(lpfx)free.o \
$(lpfx)realloc.o \
@@ -82,4 +79,3 @@ $(lpfx)reallocr.o: mallocr.c
$(lpfx)callocr.o: mallocr.c
$(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/mallocr.c -o $@
-
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index 0f8235e08852..bcdb18666d2d 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = setjmp.S memset.S memcpy.S memmove.S memcmp.S
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
--
2.34.1
More information about the Newlib
mailing list