* [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-26 15:58 ` Jon Turney
2022-01-23 6:04 ` [PATCH 2/7] newlib: libm: merge machine/ configure scripts " Mike Frysinger
` (6 subsequent siblings)
7 siblings, 1 reply; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
The machine/{configure,Makefile} files exist only to fan out to the
specific machine/$arch/ subdir. We already have all that same info
in the libm/ dir itself, so by moving the recursive configure and
make calls into it, we can cut off this logic entirely and save the
overhead.
For arches that don't have a machine subdir, it means they can skip
the logic entirely.
---
newlib/libm/Makefile.am | 5 +-
newlib/libm/Makefile.in | 6 +-
newlib/libm/common/Makefile.in | 1 +
newlib/libm/complex/Makefile.in | 1 +
newlib/libm/configure | 71 +-
newlib/libm/configure.ac | 25 +-
newlib/libm/fenv/Makefile.in | 1 +
newlib/libm/machine/Makefile.am | 26 -
newlib/libm/machine/Makefile.in | 650 --
newlib/libm/machine/aclocal.m4 | 1178 ---
newlib/libm/machine/configure | 14383 -----------------------------
newlib/libm/machine/configure.ac | 53 -
newlib/libm/math/Makefile.in | 1 +
newlib/libm/mathfp/Makefile.in | 1 +
14 files changed, 93 insertions(+), 16309 deletions(-)
delete mode 100644 newlib/libm/machine/Makefile.am
delete mode 100644 newlib/libm/machine/Makefile.in
delete mode 100644 newlib/libm/machine/aclocal.m4
delete mode 100755 newlib/libm/machine/configure
delete mode 100644 newlib/libm/machine/configure.ac
diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 8d355cbf6f69..5165ff34b9c0 100644
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -6,7 +6,10 @@ else
MATHDIR = math
endif
-SUBDIRS = $(MATHDIR) common complex fenv machine
+SUBDIRS = $(MATHDIR) common complex fenv
+if HAVE_LIBM_MACHINE_DIR
+SUBDIRS += $(LIBM_MACHINE_DIR)
+endif
libm_la_LDFLAGS = -Xcompiler -nostdlib
diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index 3f9c01e1563f..44d3391bd60c 100644
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -27,20 +27,35 @@ if test "${use_libtool}" = "yes"; then
LT_INIT([win32-dll])
fi
-AC_CONFIG_SUBDIRS(machine)
-
AC_TYPE_LONG_DOUBLE
AM_CONDITIONAL(HAVE_LONG_DOUBLE, test x"$ac_cv_type_long_double" = x"yes")
LIBM_MACHINE_LIB=
if test -n "${libm_machine_dir}"; then
+ case ${libm_machine_dir} in
+ aarch64) AC_CONFIG_SUBDIRS(machine/aarch64) ;;
+ arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
+ i386) AC_CONFIG_SUBDIRS(machine/i386) ;;
+ nds32) AC_CONFIG_SUBDIRS(machine/nds32) ;;
+ pru) AC_CONFIG_SUBDIRS(machine/pru) ;;
+ spu) AC_CONFIG_SUBDIRS(machine/spu) ;;
+ riscv) AC_CONFIG_SUBDIRS(machine/riscv) ;;
+ x86_64) AC_CONFIG_SUBDIRS(machine/x86_64) ;;
+ powerpc) AC_CONFIG_SUBDIRS(machine/powerpc) ;;
+ sparc) AC_CONFIG_SUBDIRS(machine/sparc) ;;
+ mips) AC_CONFIG_SUBDIRS(machine/mips) ;;
+ *) AC_MSG_ERROR([unsupported libm_machine_dir "${libm_machine_dir}"]) ;;
+ esac
+
+ LIBM_MACHINE_DIR=machine/${libm_machine_dir}
if test "${use_libtool}" = "yes"; then
- LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext}
+ LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
else
- LIBM_MACHINE_LIB=machine/lib.${aext}
+ LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
fi
fi
-
+AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
+AC_SUBST(LIBM_MACHINE_DIR)
AC_SUBST(LIBM_MACHINE_LIB)
AC_CONFIG_FILES([Makefile math/Makefile mathfp/Makefile common/Makefile complex/Makefile fenv/Makefile])
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-23 6:04 ` [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level Mike Frysinger
@ 2022-01-26 15:58 ` Jon Turney
2022-01-27 2:46 ` Mike Frysinger
0 siblings, 1 reply; 19+ messages in thread
From: Jon Turney @ 2022-01-26 15:58 UTC (permalink / raw)
To: Mike Frysinger, newlib
On 23/01/2022 06:04, Mike Frysinger wrote:
> The machine/{configure,Makefile} files exist only to fan out to the
> specific machine/$arch/ subdir. We already have all that same info
> in the libm/ dir itself, so by moving the recursive configure and
> make calls into it, we can cut off this logic entirely and save the
> overhead.
>
> For arches that don't have a machine subdir, it means they can skip
> the logic entirely.
> ---
It looks like this (and the following commint) breaks 'man info' and
'make man'?
(e.g. https://github.com/cygwin/cygwin/runs/4949106511)
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-26 15:58 ` Jon Turney
@ 2022-01-27 2:46 ` Mike Frysinger
2022-01-27 15:28 ` Jon Turney
0 siblings, 1 reply; 19+ messages in thread
From: Mike Frysinger @ 2022-01-27 2:46 UTC (permalink / raw)
To: Jon Turney; +Cc: newlib
[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]
On 26 Jan 2022 15:58, Jon Turney wrote:
> On 23/01/2022 06:04, Mike Frysinger wrote:
> > The machine/{configure,Makefile} files exist only to fan out to the
> > specific machine/$arch/ subdir. We already have all that same info
> > in the libm/ dir itself, so by moving the recursive configure and
> > make calls into it, we can cut off this logic entirely and save the
> > overhead.
> >
> > For arches that don't have a machine subdir, it means they can skip
> > the logic entirely.
>
> It looks like this (and the following commint) breaks 'man info' and
> 'make man'?
>
>
> (e.g. https://github.com/cygwin/cygwin/runs/4949106511)
blah, sorry about that. i have another series pending related to man page
unification that i've been testing with and doesn't have this issue. but
that's still under review, so i pushed this quick hack fix since my series
deletes this entire chunk of code.
-mike
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -199,7 +199,7 @@ stmp-targetdep: force
rm -f tmp-targetdep.texi
targetdoc=`pwd`/tmp-targetdep.texi; \
for d in $(SUBDIRS); do \
- if test "$$d" != "."; then \
+ if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \
(cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \
fi; \
done
@@ -218,7 +218,7 @@ libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \
docbook-recursive: force
for d in $(SUBDIRS); do \
- if test "$$d" != "."; then \
+ if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \
(cd $$d && $(MAKE) docbook) || exit 1; \
fi; \
done
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-27 2:46 ` Mike Frysinger
@ 2022-01-27 15:28 ` Jon Turney
2022-01-28 0:37 ` Mike Frysinger
0 siblings, 1 reply; 19+ messages in thread
From: Jon Turney @ 2022-01-27 15:28 UTC (permalink / raw)
To: Mike Frysinger, newlib
On 27/01/2022 02:46, Mike Frysinger wrote:
> On 26 Jan 2022 15:58, Jon Turney wrote:
>> On 23/01/2022 06:04, Mike Frysinger wrote:
>>> The machine/{configure,Makefile} files exist only to fan out to the
>>> specific machine/$arch/ subdir. We already have all that same info
>>> in the libm/ dir itself, so by moving the recursive configure and
>>> make calls into it, we can cut off this logic entirely and save the
>>> overhead.
>>>
>>> For arches that don't have a machine subdir, it means they can skip
>>> the logic entirely.
>>
>> It looks like this (and the following commint) breaks 'man info' and
>> 'make man'?
>>
>>
>> (e.g. https://github.com/cygwin/cygwin/runs/4949106511)
>
> blah, sorry about that. i have another series pending related to man page
> unification that i've been testing with and doesn't have this issue. but
> that's still under review, so i pushed this quick hack fix since my series
> deletes this entire chunk of code.
> -mike
Thanks.
I hadn't noticed before, but there also seems to be something in this
series which seems to break building for x86.
(see https://github.com/cygwin/cygwin/actions/runs/1754176435)
> CC lib_a-f_exp.o
> In file included from ../../../../../../newlib/libm/machine/i386/f_exp.c:29:
> ../../../../../../newlib/libm/machine/i386/f_math.h:5:10: fatal error: fdlibm.h: No such file or directory
> 5 | #include "fdlibm.h"
> | ^~~~~~~~~~
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-27 15:28 ` Jon Turney
@ 2022-01-28 0:37 ` Mike Frysinger
2022-01-28 14:28 ` Jon Turney
0 siblings, 1 reply; 19+ messages in thread
From: Mike Frysinger @ 2022-01-28 0:37 UTC (permalink / raw)
To: Jon Turney; +Cc: newlib
[-- Attachment #1: Type: text/plain, Size: 973 bytes --]
On 27 Jan 2022 15:28, Jon Turney wrote:
> I hadn't noticed before, but there also seems to be something in this
> series which seems to break building for x86.
i haven't been able to get an i686 or x86_64 build of newlib working at all.
like, not even before i landed any commits. so it's been hard for me to test
those targets specifically. cygwin in particular doesn't work out of the box
as building gcc blows up :(.
i sent you a small patch series which should fix this though.
> (see https://github.com/cygwin/cygwin/actions/runs/1754176435)
>
> > CC lib_a-f_exp.o
> > In file included from ../../../../../../newlib/libm/machine/i386/f_exp.c:29:
> > ../../../../../../newlib/libm/machine/i386/f_math.h:5:10: fatal error: fdlibm.h: No such file or directory
> > 5 | #include "fdlibm.h"
> > | ^~~~~~~~~~
you prob want to run --disable-silent-rules in your CI system so the full
compile commands are logged.
-mike
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-28 0:37 ` Mike Frysinger
@ 2022-01-28 14:28 ` Jon Turney
2022-01-29 4:56 ` Mike Frysinger
0 siblings, 1 reply; 19+ messages in thread
From: Jon Turney @ 2022-01-28 14:28 UTC (permalink / raw)
To: Mike Frysinger, newlib
On 28/01/2022 00:37, Mike Frysinger wrote:
> On 27 Jan 2022 15:28, Jon Turney wrote:
>> I hadn't noticed before, but there also seems to be something in this
>> series which seems to break building for x86.
>
> i haven't been able to get an i686 or x86_64 build of newlib working at all.
Even on niche architectures like those, you'd think there was *someone*
using newlib. :)
> like, not even before i landed any commits. so it's been hard for me to test
> those targets specifically. cygwin in particular doesn't work out of the box
> as building gcc blows up :(.
Yeah, gcc possibly requires some patches for that.
A copr with a cygwin toolchain exists, which that workflow probably
serves as an example of how to use to setup a container to build for cygwin.
Or you could just fork that repo, or push to a topic branch on
sourceware, and that CI should run on it.
> i sent you a small patch series which should fix this though.
Thanks.
Those seem to fix it, and make sense.
There might be some scope in [2/3] for using ${srcdir} relative paths,
rather than making everything absolute?
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level
2022-01-28 14:28 ` Jon Turney
@ 2022-01-29 4:56 ` Mike Frysinger
0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-29 4:56 UTC (permalink / raw)
To: Jon Turney; +Cc: newlib
[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]
On 28 Jan 2022 14:28, Jon Turney wrote:
> There might be some scope in [2/3] for using ${srcdir} relative paths,
> rather than making everything absolute?
as it stands atm, i don't think so. srcdir is not guaranteed to be relative,
it is just often so. that means you can't assume it is and then try to prefix
it to make it work in subdirs.
so as long as the Makefile is not in the same directory as the configure, the
only reliable thing is to use absolute paths in the Makefile.
that said, some of the work i've done to get rid of recursive make would help
here. if the subdir doesn't have a Makefile, but has a makefile fragment that
is included in the Makefile that lives alongside the configure script, then we
can use relative paths again. tbh, i'm not sure how much i'm going to do in
that space. automake generates a lot faster than autoconf, and recursive make
is faster than recursive configure. still not ideal, but not the worst. maybe
i'll finish libm and leave it at that. at least give time for the codebase to
settle and for people to report regressions.
-mike
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 2/7] newlib: libm: merge machine/ configure scripts up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
2022-01-23 6:04 ` [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-23 6:04 ` [PATCH 3/7] newlib: libc: merge machine/ trampoline " Mike Frysinger
` (5 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
The machine configure scripts are all effectively stub scripts that
pass the higher level options to its own makefile. The only one doing
any custom tests was nds32. The rest were all effectively the same as
the libm/ configure script.
So instead of recursively running configure in all of these subdirs,
generate their makefiles from the top-level configure. For nds32,
deploy a pattern of including subdir logic via m4:
m4_include([machine/nds32/acinclude.m4])
Even its set of checks are very small -- it does 2 preprocessor tests
and sets up 2 makefile conditionals.
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/libm/Makefile.in | 5 +-
newlib/libm/common/Makefile.in | 5 +-
newlib/libm/complex/Makefile.in | 5 +-
newlib/libm/configure | 272 +-
newlib/libm/configure.ac | 26 +-
newlib/libm/fenv/Makefile.in | 5 +-
newlib/libm/machine/aarch64/Makefile.am | 3 -
newlib/libm/machine/aarch64/Makefile.in | 125 +-
newlib/libm/machine/aarch64/aclocal.m4 | 1109 --
newlib/libm/machine/aarch64/configure | 4942 -------
newlib/libm/machine/aarch64/configure.ac | 13 -
newlib/libm/machine/arm/Makefile.am | 3 -
newlib/libm/machine/arm/Makefile.in | 125 +-
newlib/libm/machine/arm/aclocal.m4 | 1109 --
newlib/libm/machine/arm/configure | 4942 -------
newlib/libm/machine/arm/configure.ac | 13 -
newlib/libm/machine/i386/Makefile.am | 4 -
newlib/libm/machine/i386/Makefile.in | 101 +-
newlib/libm/machine/i386/aclocal.m4 | 1178 --
newlib/libm/machine/i386/configure | 14169 ---------------------
newlib/libm/machine/i386/configure.ac | 23 -
newlib/libm/machine/mips/Makefile.am | 3 -
newlib/libm/machine/mips/Makefile.in | 125 +-
newlib/libm/machine/mips/aclocal.m4 | 1109 --
newlib/libm/machine/mips/configure | 4942 -------
newlib/libm/machine/mips/configure.ac | 10 -
newlib/libm/machine/nds32/Makefile.am | 3 -
newlib/libm/machine/nds32/Makefile.in | 127 +-
newlib/libm/machine/nds32/acinclude.m4 | 17 +
newlib/libm/machine/nds32/aclocal.m4 | 1173 --
newlib/libm/machine/nds32/configure | 6066 ---------
newlib/libm/machine/nds32/configure.ac | 29 -
newlib/libm/machine/powerpc/Makefile.am | 3 -
newlib/libm/machine/powerpc/Makefile.in | 125 +-
newlib/libm/machine/powerpc/aclocal.m4 | 1109 --
newlib/libm/machine/powerpc/configure | 4942 -------
newlib/libm/machine/powerpc/configure.ac | 10 -
newlib/libm/machine/pru/Makefile.am | 3 -
newlib/libm/machine/pru/Makefile.in | 125 +-
newlib/libm/machine/pru/aclocal.m4 | 1109 --
newlib/libm/machine/pru/configure | 4942 -------
newlib/libm/machine/pru/configure.ac | 10 -
newlib/libm/machine/riscv/Makefile.am | 3 -
newlib/libm/machine/riscv/Makefile.in | 125 +-
newlib/libm/machine/riscv/aclocal.m4 | 1109 --
newlib/libm/machine/riscv/configure | 4942 -------
newlib/libm/machine/riscv/configure.ac | 10 -
newlib/libm/machine/sparc/Makefile.am | 3 -
newlib/libm/machine/sparc/Makefile.in | 125 +-
newlib/libm/machine/sparc/aclocal.m4 | 1109 --
newlib/libm/machine/sparc/configure | 4942 -------
newlib/libm/machine/sparc/configure.ac | 10 -
newlib/libm/machine/spu/Makefile.am | 3 -
newlib/libm/machine/spu/Makefile.in | 125 +-
newlib/libm/machine/spu/aclocal.m4 | 1109 --
newlib/libm/machine/spu/configure | 4942 -------
newlib/libm/machine/spu/configure.ac | 13 -
newlib/libm/machine/x86_64/Makefile.am | 3 -
newlib/libm/machine/x86_64/Makefile.in | 101 +-
newlib/libm/machine/x86_64/aclocal.m4 | 1178 --
newlib/libm/machine/x86_64/configure | 14169 ---------------------
newlib/libm/machine/x86_64/configure.ac | 23 -
newlib/libm/math/Makefile.in | 5 +-
newlib/libm/mathfp/Makefile.in | 5 +-
64 files changed, 924 insertions(+), 87289 deletions(-)
delete mode 100644 newlib/libm/machine/aarch64/aclocal.m4
delete mode 100755 newlib/libm/machine/aarch64/configure
delete mode 100644 newlib/libm/machine/aarch64/configure.ac
delete mode 100644 newlib/libm/machine/arm/aclocal.m4
delete mode 100755 newlib/libm/machine/arm/configure
delete mode 100644 newlib/libm/machine/arm/configure.ac
delete mode 100644 newlib/libm/machine/i386/aclocal.m4
delete mode 100755 newlib/libm/machine/i386/configure
delete mode 100644 newlib/libm/machine/i386/configure.ac
delete mode 100644 newlib/libm/machine/mips/aclocal.m4
delete mode 100755 newlib/libm/machine/mips/configure
delete mode 100644 newlib/libm/machine/mips/configure.ac
create mode 100644 newlib/libm/machine/nds32/acinclude.m4
delete mode 100644 newlib/libm/machine/nds32/aclocal.m4
delete mode 100755 newlib/libm/machine/nds32/configure
delete mode 100644 newlib/libm/machine/nds32/configure.ac
delete mode 100644 newlib/libm/machine/powerpc/aclocal.m4
delete mode 100755 newlib/libm/machine/powerpc/configure
delete mode 100644 newlib/libm/machine/powerpc/configure.ac
delete mode 100644 newlib/libm/machine/pru/aclocal.m4
delete mode 100755 newlib/libm/machine/pru/configure
delete mode 100644 newlib/libm/machine/pru/configure.ac
delete mode 100644 newlib/libm/machine/riscv/aclocal.m4
delete mode 100755 newlib/libm/machine/riscv/configure
delete mode 100644 newlib/libm/machine/riscv/configure.ac
delete mode 100644 newlib/libm/machine/sparc/aclocal.m4
delete mode 100755 newlib/libm/machine/sparc/configure
delete mode 100644 newlib/libm/machine/sparc/configure.ac
delete mode 100644 newlib/libm/machine/spu/aclocal.m4
delete mode 100644 newlib/libm/machine/spu/configure
delete mode 100644 newlib/libm/machine/spu/configure.ac
delete mode 100644 newlib/libm/machine/x86_64/aclocal.m4
delete mode 100755 newlib/libm/machine/x86_64/configure
delete mode 100644 newlib/libm/machine/x86_64/configure.ac
diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index 44d3391bd60c..e4611ed846dd 100644
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -30,20 +30,24 @@ fi
AC_TYPE_LONG_DOUBLE
AM_CONDITIONAL(HAVE_LONG_DOUBLE, test x"$ac_cv_type_long_double" = x"yes")
+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])
+
LIBM_MACHINE_LIB=
if test -n "${libm_machine_dir}"; then
case ${libm_machine_dir} in
- aarch64) AC_CONFIG_SUBDIRS(machine/aarch64) ;;
- arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
- i386) AC_CONFIG_SUBDIRS(machine/i386) ;;
- nds32) AC_CONFIG_SUBDIRS(machine/nds32) ;;
- pru) AC_CONFIG_SUBDIRS(machine/pru) ;;
- spu) AC_CONFIG_SUBDIRS(machine/spu) ;;
- riscv) AC_CONFIG_SUBDIRS(machine/riscv) ;;
- x86_64) AC_CONFIG_SUBDIRS(machine/x86_64) ;;
- powerpc) AC_CONFIG_SUBDIRS(machine/powerpc) ;;
- sparc) AC_CONFIG_SUBDIRS(machine/sparc) ;;
- mips) AC_CONFIG_SUBDIRS(machine/mips) ;;
+ aarch64) AC_CONFIG_FILES([machine/aarch64/Makefile]) ;;
+ arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
+ i386) AC_CONFIG_FILES([machine/i386/Makefile]) ;;
+ nds32) AC_CONFIG_FILES([machine/nds32/Makefile]) ;;
+ pru) AC_CONFIG_FILES([machine/pru/Makefile]) ;;
+ spu) AC_CONFIG_FILES([machine/spu/Makefile]) ;;
+ riscv) AC_CONFIG_FILES([machine/riscv/Makefile]) ;;
+ x86_64) AC_CONFIG_FILES([machine/x86_64/Makefile]) ;;
+ powerpc) AC_CONFIG_FILES([machine/powerpc/Makefile]) ;;
+ sparc) AC_CONFIG_FILES([machine/sparc/Makefile]) ;;
+ mips) AC_CONFIG_FILES([machine/mips/Makefile]) ;;
*) AC_MSG_ERROR([unsupported libm_machine_dir "${libm_machine_dir}"]) ;;
esac
diff --git a/newlib/libm/machine/aarch64/Makefile.am b/newlib/libm/machine/aarch64/Makefile.am
index b2ad4ecc44b4..1073ddcf944f 100644
--- a/newlib/libm/machine/aarch64/Makefile.am
+++ b/newlib/libm/machine/aarch64/Makefile.am
@@ -53,6 +53,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/arm/Makefile.am b/newlib/libm/machine/arm/Makefile.am
index b030bd157cb1..30ab57b00644 100644
--- a/newlib/libm/machine/arm/Makefile.am
+++ b/newlib/libm/machine/arm/Makefile.am
@@ -43,6 +43,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index deca873ac495..85e9a0299ef4 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -30,7 +30,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/libm/machine/mips/Makefile.am b/newlib/libm/machine/mips/Makefile.am
index 4fe79397c4ca..67e551ec5f63 100644
--- a/newlib/libm/machine/mips/Makefile.am
+++ b/newlib/libm/machine/mips/Makefile.am
@@ -24,6 +24,3 @@ lib_a-fenv.o: fenv.c
lib_a-fenv.obj: fenv.c
$(COMPILE) -mno-mips16 -c -o $@ `if test -f 'fenv.c'; then $(CYGPATH_W) 'fenv.c'; else $(CYGPATH_W) '$(srcdir)/fenv.c'; fi`
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/nds32/Makefile.am b/newlib/libm/machine/nds32/Makefile.am
index ee3af7243e29..85da0861a2d6 100644
--- a/newlib/libm/machine/nds32/Makefile.am
+++ b/newlib/libm/machine/nds32/Makefile.am
@@ -22,6 +22,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/nds32/acinclude.m4 b/newlib/libm/machine/nds32/acinclude.m4
new file mode 100644
index 000000000000..6363df8a3c76
--- /dev/null
+++ b/newlib/libm/machine/nds32/acinclude.m4
@@ -0,0 +1,17 @@
+if test "${libm_machine_dir}" = "nds32"; then
+ dnl Use builtin macro to detect if FPU extension support is on.
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[[#if (__NDS32_EXT_FPU_SP__)
+# error "Has nds32 FPU SP extension support"
+#endif
+]])], [has_nds32_fpu_sp="no"], [has_nds32_fpu_sp="yes"])
+
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+[[#if (__NDS32_EXT_FPU_DP__)
+# error "Has nds32 FPU DP extension support"
+#endif
+]])], [has_nds32_fpu_dp="no"], [has_nds32_fpu_dp="yes"])
+fi
+
+AM_CONDITIONAL(HAS_NDS32_FPU_SP, test "$has_nds32_fpu_sp" = "yes")
+AM_CONDITIONAL(HAS_NDS32_FPU_DP, test "$has_nds32_fpu_dp" = "yes")
diff --git a/newlib/libm/machine/powerpc/Makefile.am b/newlib/libm/machine/powerpc/Makefile.am
index bd5cf0b19c0d..353d0395d756 100644
--- a/newlib/libm/machine/powerpc/Makefile.am
+++ b/newlib/libm/machine/powerpc/Makefile.am
@@ -14,6 +14,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/pru/Makefile.am b/newlib/libm/machine/pru/Makefile.am
index d7402a6e97f1..e85e45b3f345 100644
--- a/newlib/libm/machine/pru/Makefile.am
+++ b/newlib/libm/machine/pru/Makefile.am
@@ -13,6 +13,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/riscv/Makefile.am b/newlib/libm/machine/riscv/Makefile.am
index 0b8775dff4df..38519251b42e 100644
--- a/newlib/libm/machine/riscv/Makefile.am
+++ b/newlib/libm/machine/riscv/Makefile.am
@@ -26,6 +26,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/sparc/Makefile.am b/newlib/libm/machine/sparc/Makefile.am
index 7faf09f3d185..c2b89ecd38c3 100644
--- a/newlib/libm/machine/sparc/Makefile.am
+++ b/newlib/libm/machine/sparc/Makefile.am
@@ -15,6 +15,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/spu/Makefile.am b/newlib/libm/machine/spu/Makefile.am
index 338a8cc0a5f6..1a575df95f18 100644
--- a/newlib/libm/machine/spu/Makefile.am
+++ b/newlib/libm/machine/spu/Makefile.am
@@ -33,6 +33,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
noinst_DATA =
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/x86_64/Makefile.am b/newlib/libm/machine/x86_64/Makefile.am
index 44f5b024417c..6c30f4364877 100644
--- a/newlib/libm/machine/x86_64/Makefile.am
+++ b/newlib/libm/machine/x86_64/Makefile.am
@@ -22,6 +22,3 @@ noinst_DATA =
endif # USE_LIBTOOL
include $(srcdir)/../../../Makefile.shared
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 3/7] newlib: libc: merge machine/ trampoline up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
2022-01-23 6:04 ` [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level Mike Frysinger
2022-01-23 6:04 ` [PATCH 2/7] newlib: libm: merge machine/ configure scripts " Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-23 6:04 ` [PATCH 4/7] newlib: libc: merge sys/ " Mike Frysinger
` (4 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
The machine/{configure,Makefile} files exist only to fan out to the
specific machine/$arch/ subdir. We already have all that same info
in the libc/ dir itself, so by moving the recursive configure and
make calls into it, we can cut off this logic entirely and save the
overhead.
For arches that don't have a machine subdir, it means they can skip
the logic entirely. Although there's prob not too many of those.
---
newlib/libc/Makefile.am | 10 +-
newlib/libc/Makefile.in | 16 +-
newlib/libc/argz/Makefile.in | 1 +
newlib/libc/configure | 211 +-
newlib/libc/configure.ac | 73 +-
newlib/libc/ctype/Makefile.in | 1 +
newlib/libc/errno/Makefile.in | 1 +
newlib/libc/iconv/Makefile.in | 1 +
newlib/libc/iconv/ccs/Makefile.in | 1 +
newlib/libc/iconv/ccs/binary/Makefile.in | 1 +
newlib/libc/iconv/ces/Makefile.in | 1 +
newlib/libc/iconv/lib/Makefile.in | 1 +
newlib/libc/locale/Makefile.in | 1 +
newlib/libc/machine/Makefile.am | 26 -
newlib/libc/machine/Makefile.in | 649 -
newlib/libc/machine/aclocal.m4 | 1178 --
newlib/libc/machine/configure | 14514 ---------------------
newlib/libc/machine/configure.ac | 89 -
newlib/libc/misc/Makefile.in | 1 +
newlib/libc/posix/Makefile.in | 1 +
newlib/libc/reent/Makefile.in | 1 +
newlib/libc/search/Makefile.in | 1 +
newlib/libc/signal/Makefile.in | 1 +
newlib/libc/ssp/Makefile.in | 1 +
newlib/libc/stdio/Makefile.in | 1 +
newlib/libc/stdio64/Makefile.in | 1 +
newlib/libc/stdlib/Makefile.in | 1 +
newlib/libc/string/Makefile.in | 1 +
newlib/libc/syscalls/Makefile.in | 1 +
newlib/libc/time/Makefile.in | 1 +
newlib/libc/unix/Makefile.in | 1 +
newlib/libc/xdr/Makefile.in | 1 +
32 files changed, 316 insertions(+), 16473 deletions(-)
delete mode 100644 newlib/libc/machine/Makefile.am
delete mode 100644 newlib/libc/machine/Makefile.in
delete mode 100644 newlib/libc/machine/aclocal.m4
delete mode 100755 newlib/libc/machine/configure
delete mode 100644 newlib/libc/machine/configure.ac
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index cdeaf84c4e21..4700f46993ce 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -39,8 +39,14 @@ endif
# The order of SUBDIRS is important for the integrated documentation.
# Do not change the order without considering the doc impact.
SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
- errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
- $(XDR_SUBDIR) ssp .
+ errno misc $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
+ $(XDR_SUBDIR) ssp
+if HAVE_LIBC_MACHINE_DIR
+SUBDIRS += $(LIBC_MACHINE_DIR)
+endif
+# NB: This must come last to avoid parallel build issues with current lib.a
+# accumulation logic.
+SUBDIRS += .
noinst_DATA = $(CRT0)
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 9ed0a5a2e059..2521d6cec432 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -58,7 +58,7 @@ if test "${use_libtool}" = "yes"; then
LT_INIT([win32-dll])
fi
-AC_CONFIG_SUBDIRS(machine sys)
+AC_CONFIG_SUBDIRS(sys)
CRT0=
if test "x${have_crt0}" = "xyes"; then
@@ -182,13 +182,80 @@ 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)
+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) ;;
+ *) AC_MSG_ERROR([unsupported machine_dir "${machine_dir}"]) ;;
+ esac
+
+ LIBC_MACHINE_DIR=machine/${machine_dir}
if test "${use_libtool}" = "yes"; then
- LIBC_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
+ LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib${machine_dir}.${aext}
else
- LIBC_MACHINE_LIB=machine/lib.${aext}
+ LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib.${aext}
fi
fi
+AM_CONDITIONAL(HAVE_LIBC_MACHINE_DIR, test "x${LIBC_MACHINE_DIR}" != x)
+AC_SUBST(LIBC_MACHINE_DIR)
AC_SUBST(LIBC_MACHINE_LIB)
AC_SUBST(machine_dir)
AC_SUBST(shared_machine_dir)
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index a6bd94360c77..67d441c7a133 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -192,6 +192,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBC_MACHINE_DIR = @LIBC_MACHINE_DIR@
LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 4/7] newlib: libc: merge sys/ trampoline up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
` (2 preceding siblings ...)
2022-01-23 6:04 ` [PATCH 3/7] newlib: libc: merge machine/ trampoline " Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-23 6:04 ` [PATCH 5/7] newlib: libc: install CRT0 straight out of subdir Mike Frysinger
` (3 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
The sys/{configure,Makefile} files exist to fan out to the specific
sys/$arch/ subdir, and to possibly generate a crt0. We already have
all that same info in the libc/ dir itself, so by moving the recursive
configure and make calls into it, we can cut off some of this logic
entirely and save the overhead.
For arches that don't have a sys subdir, it means they can skip the
logic entirely.
The sys subdir itself is kept for the crt0 logic, for now. We'll try
and clean that up next.
---
newlib/libc/Makefile.am | 5 +-
newlib/libc/Makefile.in | 13 +-
newlib/libc/argz/Makefile.in | 1 +
newlib/libc/configure | 126 +-
newlib/libc/configure.ac | 43 +-
newlib/libc/ctype/Makefile.in | 1 +
newlib/libc/errno/Makefile.in | 1 +
newlib/libc/iconv/Makefile.in | 1 +
newlib/libc/iconv/ccs/Makefile.in | 1 +
newlib/libc/iconv/ccs/binary/Makefile.in | 1 +
newlib/libc/iconv/ces/Makefile.in | 1 +
newlib/libc/iconv/lib/Makefile.in | 1 +
newlib/libc/locale/Makefile.in | 1 +
newlib/libc/misc/Makefile.in | 1 +
newlib/libc/posix/Makefile.in | 1 +
newlib/libc/reent/Makefile.in | 1 +
newlib/libc/search/Makefile.in | 1 +
newlib/libc/signal/Makefile.in | 1 +
newlib/libc/ssp/Makefile.in | 1 +
newlib/libc/stdio/Makefile.in | 1 +
newlib/libc/stdio64/Makefile.in | 1 +
newlib/libc/stdlib/Makefile.in | 1 +
newlib/libc/string/Makefile.in | 1 +
newlib/libc/sys/Makefile.am | 21 -
newlib/libc/sys/Makefile.in | 374 +-
newlib/libc/sys/aclocal.m4 | 1178 --
newlib/libc/sys/configure | 14428 ---------------------
newlib/libc/sys/configure.ac | 63 -
newlib/libc/syscalls/Makefile.in | 1 +
newlib/libc/time/Makefile.in | 1 +
newlib/libc/unix/Makefile.in | 1 +
newlib/libc/xdr/Makefile.in | 1 +
32 files changed, 269 insertions(+), 16005 deletions(-)
delete mode 100644 newlib/libc/sys/aclocal.m4
delete mode 100755 newlib/libc/sys/configure
delete mode 100644 newlib/libc/sys/configure.ac
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 4700f46993ce..a57c501b9d46 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -38,9 +38,12 @@ endif
# The order of SUBDIRS is important for the integrated documentation.
# Do not change the order without considering the doc impact.
-SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
+SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) sys time locale reent \
errno misc $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
$(XDR_SUBDIR) ssp
+if HAVE_SYS_DIR
+SUBDIRS += $(SYS_DIR)
+endif
if HAVE_LIBC_MACHINE_DIR
SUBDIRS += $(LIBC_MACHINE_DIR)
endif
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 2521d6cec432..290e259299af 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -58,8 +58,6 @@ if test "${use_libtool}" = "yes"; then
LT_INIT([win32-dll])
fi
-AC_CONFIG_SUBDIRS(sys)
-
CRT0=
if test "x${have_crt0}" = "xyes"; then
CRT0=crt0.o
@@ -167,12 +165,47 @@ dnl do. However, we do need to know whether they will produce a library.
LIBC_SYS_LIB=
if test -n "${sys_dir}"; then
+ case ${sys_dir} in
+ a29khif) AC_CONFIG_SUBDIRS(sys/a29khif) ;;
+ amdgcn) AC_CONFIG_SUBDIRS(sys/amdgcn) ;;
+ arm) AC_CONFIG_SUBDIRS(sys/arm) ;;
+ d10v) AC_CONFIG_SUBDIRS(sys/d10v) ;;
+ decstation) AC_CONFIG_SUBDIRS(sys/decstation) ;;
+ epiphany) AC_CONFIG_SUBDIRS(sys/epiphany) ;;
+ h8300hms) AC_CONFIG_SUBDIRS(sys/h8300hms) ;;
+ h8500hms) AC_CONFIG_SUBDIRS(sys/h8500hms) ;;
+ linux) AC_CONFIG_SUBDIRS(sys/linux) ;;
+ m88kbug) AC_CONFIG_SUBDIRS(sys/m88kbug) ;;
+ mmixware) AC_CONFIG_SUBDIRS(sys/mmixware) ;;
+ netware) AC_CONFIG_SUBDIRS(sys/netware) ;;
+ or1k) AC_CONFIG_SUBDIRS(sys/or1k) ;;
+ phoenix) AC_CONFIG_SUBDIRS(sys/phoenix) ;;
+ rdos) AC_CONFIG_SUBDIRS(sys/rdos) ;;
+ rtems) AC_CONFIG_SUBDIRS(sys/rtems) ;;
+ sh) AC_CONFIG_SUBDIRS(sys/sh) ;;
+ sparc64) AC_CONFIG_SUBDIRS(sys/sparc64) ;;
+ sun4) AC_CONFIG_SUBDIRS(sys/sun4) ;;
+ sysmec) AC_CONFIG_SUBDIRS(sys/sysmec) ;;
+ sysnec810) AC_CONFIG_SUBDIRS(sys/sysnec810) ;;
+ sysnecv850) AC_CONFIG_SUBDIRS(sys/sysnecv850) ;;
+ sysvi386) AC_CONFIG_SUBDIRS(sys/sysvi386) ;;
+ sysvnecv70) AC_CONFIG_SUBDIRS(sys/sysvnecv70) ;;
+ tic80) AC_CONFIG_SUBDIRS(sys/tic80) ;;
+ tirtos) AC_CONFIG_SUBDIRS(sys/tirtos) ;;
+ w65) AC_CONFIG_SUBDIRS(sys/w65) ;;
+ z8ksim) AC_CONFIG_SUBDIRS(sys/z8ksim) ;;
+ *) AC_MSG_ERROR([unsupported sys_dir "${sys_dir}"]) ;;
+ esac
+
+ SYS_DIR=sys/${sys_dir}
if test "${use_libtool}" = "yes"; then
- LIBC_SYS_LIB=sys/${sys_dir}/lib${sys_dir}.${aext}
+ LIBC_SYS_LIB=${SYS_DIR}/lib${sys_dir}.${aext}
else
- LIBC_SYS_LIB=sys/lib.${aext}
+ LIBC_SYS_LIB=${SYS_DIR}/lib.${aext}
fi
fi
+AC_SUBST(SYS_DIR)
+AM_CONDITIONAL(HAVE_SYS_DIR, test x${sys_dir} != x)
AC_SUBST(LIBC_SYS_LIB)
AC_SUBST(sys_dir)
@@ -260,5 +293,5 @@ AC_SUBST(LIBC_MACHINE_LIB)
AC_SUBST(machine_dir)
AC_SUBST(shared_machine_dir)
-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_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 sys/Makefile xdr/Makefile])
AC_OUTPUT
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
index 67d441c7a133..bba8db2431b1 100644
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ b/newlib/libc/iconv/ccs/binary/Makefile.in
@@ -238,6 +238,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYS_DIR = @SYS_DIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff --git a/newlib/libc/sys/Makefile.am b/newlib/libc/sys/Makefile.am
index a8e65ec80345..eb1b4a7dad05 100644
--- a/newlib/libc/sys/Makefile.am
+++ b/newlib/libc/sys/Makefile.am
@@ -1,25 +1,7 @@
## Process this file with automake to generate Makefile.in
-SUBDIRS = $(sys_dir) .
-
-if HAVE_SYS_DIR
-SYSLIB = lib.a
-endif
-
noinst_DATA = $(CRT0)
-if USE_LIBTOOL
-else
-noinst_LIBRARIES = $(SYSLIB)
-
-lib.a: $(sys_dir)/lib.a
- rm -f $@
- ln $(sys_dir)/lib.a $@ >/dev/null 2>/dev/null \
- || cp $(sys_dir)/lib.a $@
-endif # USE_LIBTOOL
-
-$(sys_dir)/libsys.$(aext): ; @true
-
$(CRT0): $(sys_dir)/$(CRT0)
rm -f $@
ln $(sys_dir)/$(CRT0) $@ >/dev/null 2>/dev/null \
@@ -32,6 +14,3 @@ CLEANFILES = $(CRT0)
doc:
docbook:
-
-ACLOCAL_AMFLAGS = -I ../.. -I ../../.. -I ../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/Makefile.in b/newlib/libc/sys/Makefile.in
index c201749424be..b0f5e00381e3 100644
--- a/newlib/libc/sys/Makefile.in
+++ b/newlib/libc/sys/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -89,36 +88,23 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = .
+subdir = sys
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../../config/depstand.m4 \
- $(top_srcdir)/../../../config/lead-dot.m4 \
- $(top_srcdir)/../../../config/override.m4 \
- $(top_srcdir)/../../../libtool.m4 \
- $(top_srcdir)/../../../ltoptions.m4 \
- $(top_srcdir)/../../../ltsugar.m4 \
- $(top_srcdir)/../../../ltversion.m4 \
- $(top_srcdir)/../../../lt~obsolete.m4 \
- $(top_srcdir)/../../acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
+ $(top_srcdir)/../../config/lead-dot.m4 \
+ $(top_srcdir)/../../config/override.m4 \
+ $(top_srcdir)/../../libtool.m4 \
+ $(top_srcdir)/../../ltoptions.m4 \
+ $(top_srcdir)/../../ltsugar.m4 \
+ $(top_srcdir)/../../ltversion.m4 \
+ $(top_srcdir)/../../lt~obsolete.m4 \
+ $(top_srcdir)/../acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.am
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo " AR " $@;
-am__v_AR_1 =
-lib_a_AR = $(AR) $(ARFLAGS)
-lib_a_LIBADD =
-lib_a_SOURCES = lib.c
-lib_a_OBJECTS = lib.$(OBJEXT)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -131,75 +117,16 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = lib.c
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
- tags-recursive uninstall-recursive
+SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
DATA = $(noinst_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
- $(RECURSIVE_TARGETS) \
- $(RECURSIVE_CLEAN_TARGETS) \
- $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-DIST_SUBDIRS = $(SUBDIRS)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -237,6 +164,21 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBC_MACHINE_DIR = @LIBC_MACHINE_DIR@
+LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
+LIBC_POSIX_DEF = @LIBC_POSIX_DEF@
+LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
+LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
+LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
+LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
+LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
+LIBC_STDIO_DEF = @LIBC_STDIO_DEF@
+LIBC_STDIO_LIB = @LIBC_STDIO_LIB@
+LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
+LIBC_SYS_LIB = @LIBC_SYS_LIB@
+LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
+LIBC_XDR_DEF = @LIBC_XDR_DEF@
+LIBC_XDR_LIB = @LIBC_XDR_LIB@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@@ -268,6 +210,7 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYS_DIR = @SYS_DIR@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -329,202 +272,65 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = $(sys_dir) .
-@HAVE_SYS_DIR_TRUE@SYSLIB = lib.a
noinst_DATA = $(CRT0)
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = $(SYSLIB)
CLEANFILES = $(CRT0)
-ACLOCAL_AMFLAGS = -I ../.. -I ../../.. -I ../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-all: all-recursive
+all: all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh: Makefile
- @:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps sys/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign --ignore-deps Makefile
+ $(AUTOMAKE) --foreign --ignore-deps sys/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- $(am__cd) $(srcdir) && $(AUTOCONF)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-@USE_LIBTOOL_TRUE@lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) $(EXTRA_lib_a_DEPENDENCIES)
-@USE_LIBTOOL_TRUE@ $(AM_V_at)-rm -f lib.a
-@USE_LIBTOOL_TRUE@ $(AM_V_AR)$(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-@USE_LIBTOOL_TRUE@ $(AM_V_at)$(RANLIB) lib.a
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-.c.o:
- $(AM_V_CC)$(COMPILE) -c -o $@ $<
-
-.c.obj:
- $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
-distclean-libtool:
- -rm -f libtool config.lt
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-# (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
- @fail=; \
- if $(am__make_keepgoing); then \
- failcom='fail=yes'; \
- else \
- failcom='exit 1'; \
- fi; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
- test ! -s cscope.files \
- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
- -rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES) $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
+installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -547,105 +353,89 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic
-dvi: dvi-recursive
+dvi: dvi-am
dvi-am:
-html: html-recursive
+html: html-am
html-am:
-info: info-recursive
+info: info-am
info-am:
install-data-am:
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
install-dvi-am:
install-exec-am:
-install-html: install-html-recursive
+install-html: install-html-am
install-html-am:
-install-info: install-info-recursive
+install-info: install-info-am
install-info-am:
install-man:
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
install-pdf-am:
-install-ps: install-ps-recursive
+install-ps: install-ps-am
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
+maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-recursive
+pdf: pdf-am
pdf-am:
-ps: ps-recursive
+ps: ps-am
ps-am:
uninstall-am:
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- clean-libtool clean-noinstLIBRARIES cscope cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am
+ tags-am uninstall uninstall-am
.PRECIOUS: Makefile
-@USE_LIBTOOL_FALSE@lib.a: $(sys_dir)/lib.a
-@USE_LIBTOOL_FALSE@ rm -f $@
-@USE_LIBTOOL_FALSE@ ln $(sys_dir)/lib.a $@ >/dev/null 2>/dev/null \
-@USE_LIBTOOL_FALSE@ || cp $(sys_dir)/lib.a $@
-
-$(sys_dir)/libsys.$(aext): ; @true
-
$(CRT0): $(sys_dir)/$(CRT0)
rm -f $@
ln $(sys_dir)/$(CRT0) $@ >/dev/null 2>/dev/null \
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 5/7] newlib: libc: install CRT0 straight out of subdir
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
` (3 preceding siblings ...)
2022-01-23 6:04 ` [PATCH 4/7] newlib: libc: merge sys/ " Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-23 6:04 ` [PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level Mike Frysinger
` (2 subsequent siblings)
7 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
There's no need to have a sys/ subdir just to copy the sys/$arch/crt0.o
up to sys/crt0.o, and then have libc/ copy sys/crt0.o up again. Just
have libc/ refer to sys/$arch/crt0.o directly and drop the intermediate
makefile entirely.
---
newlib/libc/Makefile.am | 10 +-
newlib/libc/Makefile.in | 14 +-
newlib/libc/configure | 5 +-
newlib/libc/configure.ac | 4 +-
newlib/libc/sys/Makefile.am | 16 --
newlib/libc/sys/Makefile.in | 452 ------------------------------------
6 files changed, 10 insertions(+), 491 deletions(-)
delete mode 100644 newlib/libc/sys/Makefile.am
delete mode 100644 newlib/libc/sys/Makefile.in
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index a57c501b9d46..7807291ba3ad 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -38,7 +38,7 @@ endif
# The order of SUBDIRS is important for the integrated documentation.
# Do not change the order without considering the doc impact.
-SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) sys time locale reent \
+SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale reent \
errno misc $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) \
$(XDR_SUBDIR) ssp
if HAVE_SYS_DIR
@@ -124,12 +124,6 @@ endif # USE_LIBTOOL
$(SUBLIBS): ; @true
-crt0.o: sys/crt0.o
- rm -f $@
- ln sys/crt0.o $@ >/dev/null 2>/dev/null || cp sys/crt0.o $@
-
-sys/crt0.o: ; @true
-
# This is a list of the stmp-def files in each subdirectory which
# builds .def files. We don't list subdirectories which don't build
# .def files; if the list of subdirectories changes, we must change
@@ -242,7 +236,7 @@ install-man: man
.PHONY: force
force:
-CLEANFILES = $(CRT0) \
+CLEANFILES = \
sigset.texi stmp-sigset \
stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \
tmp-sigset.texi tmp-iconvset.texi \
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 290e259299af..8ca783d84a85 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -60,7 +60,7 @@ fi
CRT0=
if test "x${have_crt0}" = "xyes"; then
- CRT0=crt0.o
+ CRT0=sys/${sys_dir}/crt0.o
fi
AC_SUBST(CRT0)
@@ -293,5 +293,5 @@ AC_SUBST(LIBC_MACHINE_LIB)
AC_SUBST(machine_dir)
AC_SUBST(shared_machine_dir)
-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 sys/Makefile xdr/Makefile])
+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
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
` (4 preceding siblings ...)
2022-01-23 6:04 ` [PATCH 5/7] newlib: libc: install CRT0 straight out of subdir Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-31 16:08 ` Richard Earnshaw
2022-01-23 6:04 ` [PATCH 7/7] newlib: libc: merge machine/ configure scripts up a level Mike Frysinger
2022-01-25 13:58 ` [PATCH 0/7] newlib: reduce number of configure scripts Corinna Vinschen
7 siblings, 1 reply; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
The sys configure scripts are almost all effectively stub scripts that
pass the higher level options to its own makefile. The phoenix & linux
ones are a bit more complicated with nested subdirs, so those have been
left alone for now. Plus, I don't really have a way of testing them.
---
newlib/libc/configure | 116 +-
newlib/libc/configure.ac | 52 +-
newlib/libc/sys/a29khif/Makefile.am | 3 -
newlib/libc/sys/a29khif/Makefile.in | 165 +-
newlib/libc/sys/a29khif/aclocal.m4 | 1109 -----
newlib/libc/sys/a29khif/configure | 4942 -----------------------
newlib/libc/sys/a29khif/configure.ac | 13 -
newlib/libc/sys/amdgcn/Makefile.am | 3 -
newlib/libc/sys/amdgcn/Makefile.in | 139 +-
newlib/libc/sys/amdgcn/aclocal.m4 | 1109 -----
newlib/libc/sys/amdgcn/configure | 4942 -----------------------
newlib/libc/sys/amdgcn/configure.ac | 13 -
newlib/libc/sys/arm/Makefile.am | 3 -
newlib/libc/sys/arm/Makefile.in | 165 +-
newlib/libc/sys/arm/aclocal.m4 | 1109 -----
newlib/libc/sys/arm/configure | 4942 -----------------------
newlib/libc/sys/arm/configure.ac | 13 -
newlib/libc/sys/d10v/Makefile.am | 3 -
newlib/libc/sys/d10v/Makefile.in | 165 +-
newlib/libc/sys/d10v/aclocal.m4 | 1109 -----
newlib/libc/sys/d10v/configure | 4942 -----------------------
newlib/libc/sys/d10v/configure.ac | 13 -
newlib/libc/sys/decstation/Makefile.am | 3 -
newlib/libc/sys/decstation/Makefile.in | 154 +-
newlib/libc/sys/decstation/aclocal.m4 | 1109 -----
newlib/libc/sys/decstation/configure | 4942 -----------------------
newlib/libc/sys/decstation/configure.ac | 13 -
newlib/libc/sys/epiphany/Makefile.am | 3 -
newlib/libc/sys/epiphany/Makefile.in | 139 +-
newlib/libc/sys/epiphany/aclocal.m4 | 1109 -----
newlib/libc/sys/epiphany/configure | 4942 -----------------------
newlib/libc/sys/epiphany/configure.ac | 40 -
newlib/libc/sys/h8300hms/Makefile.am | 3 -
newlib/libc/sys/h8300hms/Makefile.in | 165 +-
newlib/libc/sys/h8300hms/aclocal.m4 | 1109 -----
newlib/libc/sys/h8300hms/configure | 4942 -----------------------
newlib/libc/sys/h8300hms/configure.ac | 13 -
newlib/libc/sys/h8500hms/Makefile.am | 3 -
newlib/libc/sys/h8500hms/Makefile.in | 150 +-
newlib/libc/sys/h8500hms/aclocal.m4 | 1109 -----
newlib/libc/sys/h8500hms/configure | 4942 -----------------------
newlib/libc/sys/h8500hms/configure.ac | 13 -
newlib/libc/sys/m88kbug/Makefile.am | 3 -
newlib/libc/sys/m88kbug/Makefile.in | 150 +-
newlib/libc/sys/m88kbug/aclocal.m4 | 1109 -----
newlib/libc/sys/m88kbug/configure | 4942 -----------------------
newlib/libc/sys/m88kbug/configure.ac | 13 -
newlib/libc/sys/mmixware/Makefile.am | 3 -
newlib/libc/sys/mmixware/Makefile.in | 165 +-
newlib/libc/sys/mmixware/aclocal.m4 | 1109 -----
newlib/libc/sys/mmixware/configure | 4942 -----------------------
newlib/libc/sys/mmixware/configure.ac | 13 -
newlib/libc/sys/netware/Makefile.am | 3 -
newlib/libc/sys/netware/Makefile.in | 154 +-
newlib/libc/sys/netware/aclocal.m4 | 1109 -----
newlib/libc/sys/netware/configure | 4942 -----------------------
newlib/libc/sys/netware/configure.ac | 13 -
newlib/libc/sys/or1k/Makefile.am | 3 -
newlib/libc/sys/or1k/Makefile.in | 154 +-
newlib/libc/sys/or1k/aclocal.m4 | 1109 -----
newlib/libc/sys/or1k/configure | 4942 -----------------------
newlib/libc/sys/or1k/configure.ac | 13 -
newlib/libc/sys/rdos/Makefile.am | 3 -
newlib/libc/sys/rdos/Makefile.in | 165 +-
newlib/libc/sys/rdos/aclocal.m4 | 1109 -----
newlib/libc/sys/rdos/configure | 4942 -----------------------
newlib/libc/sys/rdos/configure.ac | 13 -
newlib/libc/sys/rtems/Makefile.am | 3 -
newlib/libc/sys/rtems/Makefile.in | 150 +-
newlib/libc/sys/rtems/aclocal.m4 | 1109 -----
newlib/libc/sys/rtems/configure | 4942 -----------------------
newlib/libc/sys/rtems/configure.ac | 13 -
newlib/libc/sys/sh/Makefile.am | 3 -
newlib/libc/sys/sh/Makefile.in | 165 +-
newlib/libc/sys/sh/aclocal.m4 | 1109 -----
newlib/libc/sys/sh/configure | 4942 -----------------------
newlib/libc/sys/sh/configure.ac | 13 -
newlib/libc/sys/sparc64/Makefile.am | 3 -
newlib/libc/sys/sparc64/Makefile.in | 161 +-
newlib/libc/sys/sparc64/aclocal.m4 | 1109 -----
newlib/libc/sys/sparc64/configure | 4942 -----------------------
newlib/libc/sys/sparc64/configure.ac | 13 -
newlib/libc/sys/sun4/Makefile.am | 3 -
newlib/libc/sys/sun4/Makefile.in | 150 +-
newlib/libc/sys/sun4/aclocal.m4 | 1109 -----
newlib/libc/sys/sun4/configure | 4942 -----------------------
newlib/libc/sys/sun4/configure.ac | 13 -
newlib/libc/sys/sysmec/Makefile.am | 3 -
newlib/libc/sys/sysmec/Makefile.in | 165 +-
newlib/libc/sys/sysmec/aclocal.m4 | 1109 -----
newlib/libc/sys/sysmec/configure | 4942 -----------------------
newlib/libc/sys/sysmec/configure.ac | 13 -
newlib/libc/sys/sysnec810/Makefile.am | 3 -
newlib/libc/sys/sysnec810/Makefile.in | 165 +-
newlib/libc/sys/sysnec810/aclocal.m4 | 1109 -----
newlib/libc/sys/sysnec810/configure | 4942 -----------------------
newlib/libc/sys/sysnec810/configure.ac | 13 -
newlib/libc/sys/sysnecv850/Makefile.am | 3 -
newlib/libc/sys/sysnecv850/Makefile.in | 165 +-
newlib/libc/sys/sysnecv850/aclocal.m4 | 1109 -----
newlib/libc/sys/sysnecv850/configure | 4942 -----------------------
newlib/libc/sys/sysnecv850/configure.ac | 13 -
newlib/libc/sys/sysvi386/Makefile.am | 3 -
newlib/libc/sys/sysvi386/Makefile.in | 165 +-
newlib/libc/sys/sysvi386/aclocal.m4 | 1109 -----
newlib/libc/sys/sysvi386/configure | 4942 -----------------------
newlib/libc/sys/sysvi386/configure.ac | 13 -
newlib/libc/sys/sysvnecv70/Makefile.am | 3 -
newlib/libc/sys/sysvnecv70/Makefile.in | 165 +-
newlib/libc/sys/sysvnecv70/aclocal.m4 | 1109 -----
newlib/libc/sys/sysvnecv70/configure | 4942 -----------------------
newlib/libc/sys/sysvnecv70/configure.ac | 13 -
newlib/libc/sys/tic80/Makefile.am | 3 -
newlib/libc/sys/tic80/Makefile.in | 154 +-
newlib/libc/sys/tic80/aclocal.m4 | 1109 -----
newlib/libc/sys/tic80/configure | 4942 -----------------------
newlib/libc/sys/tic80/configure.ac | 13 -
newlib/libc/sys/tirtos/Makefile.am | 3 -
newlib/libc/sys/tirtos/Makefile.in | 139 +-
newlib/libc/sys/tirtos/aclocal.m4 | 1109 -----
newlib/libc/sys/tirtos/configure | 4942 -----------------------
newlib/libc/sys/tirtos/configure.ac | 13 -
newlib/libc/sys/w65/Makefile.am | 3 -
newlib/libc/sys/w65/Makefile.in | 150 +-
newlib/libc/sys/w65/aclocal.m4 | 1109 -----
newlib/libc/sys/w65/configure | 4942 -----------------------
newlib/libc/sys/w65/configure.ac | 13 -
newlib/libc/sys/z8ksim/Makefile.am | 3 -
newlib/libc/sys/z8ksim/Makefile.in | 150 +-
newlib/libc/sys/z8ksim/aclocal.m4 | 1109 -----
newlib/libc/sys/z8ksim/configure | 4942 -----------------------
newlib/libc/sys/z8ksim/configure.ac | 13 -
132 files changed, 2726 insertions(+), 159285 deletions(-)
delete mode 100644 newlib/libc/sys/a29khif/aclocal.m4
delete mode 100755 newlib/libc/sys/a29khif/configure
delete mode 100644 newlib/libc/sys/a29khif/configure.ac
delete mode 100644 newlib/libc/sys/amdgcn/aclocal.m4
delete mode 100755 newlib/libc/sys/amdgcn/configure
delete mode 100644 newlib/libc/sys/amdgcn/configure.ac
delete mode 100644 newlib/libc/sys/arm/aclocal.m4
delete mode 100755 newlib/libc/sys/arm/configure
delete mode 100644 newlib/libc/sys/arm/configure.ac
delete mode 100644 newlib/libc/sys/d10v/aclocal.m4
delete mode 100755 newlib/libc/sys/d10v/configure
delete mode 100644 newlib/libc/sys/d10v/configure.ac
delete mode 100644 newlib/libc/sys/decstation/aclocal.m4
delete mode 100755 newlib/libc/sys/decstation/configure
delete mode 100644 newlib/libc/sys/decstation/configure.ac
delete mode 100644 newlib/libc/sys/epiphany/aclocal.m4
delete mode 100755 newlib/libc/sys/epiphany/configure
delete mode 100644 newlib/libc/sys/epiphany/configure.ac
delete mode 100644 newlib/libc/sys/h8300hms/aclocal.m4
delete mode 100755 newlib/libc/sys/h8300hms/configure
delete mode 100644 newlib/libc/sys/h8300hms/configure.ac
delete mode 100644 newlib/libc/sys/h8500hms/aclocal.m4
delete mode 100755 newlib/libc/sys/h8500hms/configure
delete mode 100644 newlib/libc/sys/h8500hms/configure.ac
delete mode 100644 newlib/libc/sys/m88kbug/aclocal.m4
delete mode 100755 newlib/libc/sys/m88kbug/configure
delete mode 100644 newlib/libc/sys/m88kbug/configure.ac
delete mode 100644 newlib/libc/sys/mmixware/aclocal.m4
delete mode 100755 newlib/libc/sys/mmixware/configure
delete mode 100644 newlib/libc/sys/mmixware/configure.ac
delete mode 100644 newlib/libc/sys/netware/aclocal.m4
delete mode 100755 newlib/libc/sys/netware/configure
delete mode 100644 newlib/libc/sys/netware/configure.ac
delete mode 100644 newlib/libc/sys/or1k/aclocal.m4
delete mode 100755 newlib/libc/sys/or1k/configure
delete mode 100644 newlib/libc/sys/or1k/configure.ac
delete mode 100644 newlib/libc/sys/rdos/aclocal.m4
delete mode 100755 newlib/libc/sys/rdos/configure
delete mode 100644 newlib/libc/sys/rdos/configure.ac
delete mode 100644 newlib/libc/sys/rtems/aclocal.m4
delete mode 100755 newlib/libc/sys/rtems/configure
delete mode 100644 newlib/libc/sys/rtems/configure.ac
delete mode 100644 newlib/libc/sys/sh/aclocal.m4
delete mode 100755 newlib/libc/sys/sh/configure
delete mode 100644 newlib/libc/sys/sh/configure.ac
delete mode 100644 newlib/libc/sys/sparc64/aclocal.m4
delete mode 100755 newlib/libc/sys/sparc64/configure
delete mode 100644 newlib/libc/sys/sparc64/configure.ac
delete mode 100644 newlib/libc/sys/sun4/aclocal.m4
delete mode 100755 newlib/libc/sys/sun4/configure
delete mode 100644 newlib/libc/sys/sun4/configure.ac
delete mode 100644 newlib/libc/sys/sysmec/aclocal.m4
delete mode 100755 newlib/libc/sys/sysmec/configure
delete mode 100644 newlib/libc/sys/sysmec/configure.ac
delete mode 100644 newlib/libc/sys/sysnec810/aclocal.m4
delete mode 100755 newlib/libc/sys/sysnec810/configure
delete mode 100644 newlib/libc/sys/sysnec810/configure.ac
delete mode 100644 newlib/libc/sys/sysnecv850/aclocal.m4
delete mode 100755 newlib/libc/sys/sysnecv850/configure
delete mode 100644 newlib/libc/sys/sysnecv850/configure.ac
delete mode 100644 newlib/libc/sys/sysvi386/aclocal.m4
delete mode 100755 newlib/libc/sys/sysvi386/configure
delete mode 100644 newlib/libc/sys/sysvi386/configure.ac
delete mode 100644 newlib/libc/sys/sysvnecv70/aclocal.m4
delete mode 100755 newlib/libc/sys/sysvnecv70/configure
delete mode 100644 newlib/libc/sys/sysvnecv70/configure.ac
delete mode 100644 newlib/libc/sys/tic80/aclocal.m4
delete mode 100755 newlib/libc/sys/tic80/configure
delete mode 100644 newlib/libc/sys/tic80/configure.ac
delete mode 100644 newlib/libc/sys/tirtos/aclocal.m4
delete mode 100755 newlib/libc/sys/tirtos/configure
delete mode 100644 newlib/libc/sys/tirtos/configure.ac
delete mode 100644 newlib/libc/sys/w65/aclocal.m4
delete mode 100755 newlib/libc/sys/w65/configure
delete mode 100644 newlib/libc/sys/w65/configure.ac
delete mode 100644 newlib/libc/sys/z8ksim/aclocal.m4
delete mode 100755 newlib/libc/sys/z8ksim/configure
delete mode 100644 newlib/libc/sys/z8ksim/configure.ac
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 8ca783d84a85..436dd4070ec8 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -166,34 +166,34 @@ dnl do. However, we do need to know whether they will produce a library.
LIBC_SYS_LIB=
if test -n "${sys_dir}"; then
case ${sys_dir} in
- a29khif) AC_CONFIG_SUBDIRS(sys/a29khif) ;;
- amdgcn) AC_CONFIG_SUBDIRS(sys/amdgcn) ;;
- arm) AC_CONFIG_SUBDIRS(sys/arm) ;;
- d10v) AC_CONFIG_SUBDIRS(sys/d10v) ;;
- decstation) AC_CONFIG_SUBDIRS(sys/decstation) ;;
- epiphany) AC_CONFIG_SUBDIRS(sys/epiphany) ;;
- h8300hms) AC_CONFIG_SUBDIRS(sys/h8300hms) ;;
- h8500hms) AC_CONFIG_SUBDIRS(sys/h8500hms) ;;
+ a29khif) AC_CONFIG_FILES([sys/a29khif/Makefile]) ;;
+ amdgcn) AC_CONFIG_FILES([sys/amdgcn/Makefile]) ;;
+ arm) AC_CONFIG_FILES([sys/arm/Makefile]) ;;
+ d10v) AC_CONFIG_FILES([sys/d10v/Makefile]) ;;
+ decstation) AC_CONFIG_FILES([sys/decstation/Makefile]) ;;
+ epiphany) AC_CONFIG_FILES([sys/epiphany/Makefile]) ;;
+ h8300hms) AC_CONFIG_FILES([sys/h8300hms/Makefile]) ;;
+ h8500hms) AC_CONFIG_FILES([sys/h8500hms/Makefile]) ;;
linux) AC_CONFIG_SUBDIRS(sys/linux) ;;
- m88kbug) AC_CONFIG_SUBDIRS(sys/m88kbug) ;;
- mmixware) AC_CONFIG_SUBDIRS(sys/mmixware) ;;
- netware) AC_CONFIG_SUBDIRS(sys/netware) ;;
- or1k) AC_CONFIG_SUBDIRS(sys/or1k) ;;
+ m88kbug) AC_CONFIG_FILES([sys/m88kbug/Makefile]) ;;
+ mmixware) AC_CONFIG_FILES([sys/mmixware/Makefile]) ;;
+ netware) AC_CONFIG_FILES([sys/netware/Makefile]) ;;
+ or1k) AC_CONFIG_FILES([sys/or1k/Makefile]) ;;
phoenix) AC_CONFIG_SUBDIRS(sys/phoenix) ;;
- rdos) AC_CONFIG_SUBDIRS(sys/rdos) ;;
- rtems) AC_CONFIG_SUBDIRS(sys/rtems) ;;
- sh) AC_CONFIG_SUBDIRS(sys/sh) ;;
- sparc64) AC_CONFIG_SUBDIRS(sys/sparc64) ;;
- sun4) AC_CONFIG_SUBDIRS(sys/sun4) ;;
- sysmec) AC_CONFIG_SUBDIRS(sys/sysmec) ;;
- sysnec810) AC_CONFIG_SUBDIRS(sys/sysnec810) ;;
- sysnecv850) AC_CONFIG_SUBDIRS(sys/sysnecv850) ;;
- sysvi386) AC_CONFIG_SUBDIRS(sys/sysvi386) ;;
- sysvnecv70) AC_CONFIG_SUBDIRS(sys/sysvnecv70) ;;
- tic80) AC_CONFIG_SUBDIRS(sys/tic80) ;;
- tirtos) AC_CONFIG_SUBDIRS(sys/tirtos) ;;
- w65) AC_CONFIG_SUBDIRS(sys/w65) ;;
- z8ksim) AC_CONFIG_SUBDIRS(sys/z8ksim) ;;
+ rdos) AC_CONFIG_FILES([sys/rdos/Makefile]) ;;
+ rtems) AC_CONFIG_FILES([sys/rtems/Makefile]) ;;
+ sh) AC_CONFIG_FILES([sys/sh/Makefile]) ;;
+ sparc64) AC_CONFIG_FILES([sys/sparc64/Makefile]) ;;
+ sun4) AC_CONFIG_FILES([sys/sun4/Makefile]) ;;
+ sysmec) AC_CONFIG_FILES([sys/sysmec/Makefile]) ;;
+ sysnec810) AC_CONFIG_FILES([sys/sysnec810/Makefile]) ;;
+ sysnecv850) AC_CONFIG_FILES([sys/sysnecv850/Makefile]) ;;
+ sysvi386) AC_CONFIG_FILES([sys/sysvi386/Makefile]) ;;
+ sysvnecv70) AC_CONFIG_FILES([sys/sysvnecv70/Makefile]) ;;
+ tic80) AC_CONFIG_FILES([sys/tic80/Makefile]) ;;
+ tirtos) AC_CONFIG_FILES([sys/tirtos/Makefile]) ;;
+ w65) AC_CONFIG_FILES([sys/w65/Makefile]) ;;
+ z8ksim) AC_CONFIG_FILES([sys/z8ksim/Makefile]) ;;
*) AC_MSG_ERROR([unsupported sys_dir "${sys_dir}"]) ;;
esac
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index 6e973bc92732..f2e8644f8726 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -45,6 +45,3 @@ lib_a_SOURCES = \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
index ad2eaa710385..87f63301a5c4 100644
--- a/newlib/libc/sys/amdgcn/Makefile.am
+++ b/newlib/libc/sys/amdgcn/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = close.c fstat.c isatty.c lseek.c read.c write.c \
fcntl.c getpid.c kill.c open.c raise.c stat.c unlink.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 9aa9eafc22a3..b88c30c5a5ee 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -21,6 +21,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
if MAY_SUPPLY_SYSCALLS
all-local: crt0.o
endif
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index 5a6d300ea259..50866743a048 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
index 0cb245e8e412..22a2fa7d7008 100644
--- a/newlib/libc/sys/decstation/Makefile.am
+++ b/newlib/libc/sys/decstation/Makefile.am
@@ -40,6 +40,3 @@ all-local: crt0.o
crt0.o:
cp /lib/crt0.o crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
index 0b6ee6e8c620..5448105206db 100644
--- a/newlib/libc/sys/epiphany/Makefile.am
+++ b/newlib/libc/sys/epiphany/Makefile.am
@@ -35,6 +35,3 @@ noinst_LIBRARIES = lib.a
# crt0.o comes from libgloss
lib_a_SOURCES = e_printf.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 3e87cf66c2c3..634c9071eb5b 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 7ebe8544a348..57abb9f29199 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c misc.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index e94eaabd62af..60967d846dbf 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 0d43c1dc8fe9..24b0eccf39e5 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index 79b13a2efbe8..d2f1fec50dfa 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = \
link.c
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
index 3e149461c426..88f2c1eccbd1 100644
--- a/newlib/libc/sys/or1k/Makefile.am
+++ b/newlib/libc/sys/or1k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = getreent.S mlock.c
lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 05c093d1ff19..0bc1d26fd1ee 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -13,6 +13,3 @@ lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index 215de8ac0896..d1604295676f 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -11,9 +11,6 @@ lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
for i in $(srcdir)/include/arpa/*.h; do \
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 21cacb426e57..6dc19fe43dfa 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
index ef9c64577099..f2437ba6680c 100644
--- a/newlib/libc/sys/sparc64/Makefile.am
+++ b/newlib/libc/sys/sparc64/Makefile.am
@@ -114,6 +114,3 @@ unlink_r.o: unlink.S
wait_r.o: wait.S
wait4_r.o: wait4.S
write_r.o: write.S
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
index 1d4fe967b6ae..13f4745b09ff 100644
--- a/newlib/libc/sys/sun4/Makefile.am
+++ b/newlib/libc/sys/sun4/Makefile.am
@@ -91,6 +91,3 @@ all-local: crt0.o
crt0.o:
cp /lib/crt0.o crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index c6902a9ca832..815ebcd689b2 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index baf7d848355d..d62fd8b3a72c 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = io.S write.c sbrk.c misc.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index 06ac517b87f8..bd8474fcbfd6 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -33,6 +33,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
if MAY_SUPPLY_SYSCALLS
all-local: crt0.o
endif
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index 15284ca42297..03bc72d2f011 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -19,6 +19,3 @@ lib_a_SOURCES = \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index f27364087271..e5618f961707 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = ioctl.S isatty.S read.S lseek.S close.S sbrk.S fstat.S \
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index 2027dda7aea7..0f3a5555bfa1 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -15,6 +15,3 @@ EXTRA_LIBRARIES = libfoo.a
libfoo_a_SOURCES = crt0.c
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
index c8a2d42eeeb7..c9f73119b025 100644
--- a/newlib/libc/sys/tirtos/Makefile.am
+++ b/newlib/libc/sys/tirtos/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
lib_a_SOURCES = lock.c
lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index adba49696f2e..e58f2ecd5701 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index 6f90a0c09280..0c6706ff60ef 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = glue.c
lib_a_CFLAGS = $(AM_CFLAGS)
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
--
2.34.1
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level
2022-01-23 6:04 ` [PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level Mike Frysinger
@ 2022-01-31 16:08 ` Richard Earnshaw
2022-02-01 4:49 ` arm-eabi fails in libc/sys/arm/: No rule to make target 'lib_a-trap.o', needed by 'lib.a' Mike Frysinger
0 siblings, 1 reply; 19+ messages in thread
From: Richard Earnshaw @ 2022-01-31 16:08 UTC (permalink / raw)
To: Mike Frysinger, newlib
Hi Mike,
This patch seems to have broken arm newlib builds (at least, when not
using libgloss). I'm seeing:
make[5]: Entering directory
'/work/rearnsha/scratch/nightly/arm/master/arm-eabi/
newlib/libc/sys/arm'
CC lib_a-access.o
CC lib_a-aeabi_atexit.o
make[5]: *** No rule to make target 'lib_a-trap.o', needed by 'lib.a'. Stop.
And indeed, the Makefile in that directory now lacks anything to build
lib_a-trap.o from trap.S. Something explicit is needed because of the
non-standard file rename that we use.
R.
On 23/01/2022 06:04, Mike Frysinger wrote:
> The sys configure scripts are almost all effectively stub scripts that
> pass the higher level options to its own makefile. The phoenix & linux
> ones are a bit more complicated with nested subdirs, so those have been
> left alone for now. Plus, I don't really have a way of testing them.
> ---
> newlib/libc/configure | 116 +-
> newlib/libc/configure.ac | 52 +-
> newlib/libc/sys/a29khif/Makefile.am | 3 -
> newlib/libc/sys/a29khif/Makefile.in | 165 +-
> newlib/libc/sys/a29khif/aclocal.m4 | 1109 -----
> newlib/libc/sys/a29khif/configure | 4942 -----------------------
> newlib/libc/sys/a29khif/configure.ac | 13 -
> newlib/libc/sys/amdgcn/Makefile.am | 3 -
> newlib/libc/sys/amdgcn/Makefile.in | 139 +-
> newlib/libc/sys/amdgcn/aclocal.m4 | 1109 -----
> newlib/libc/sys/amdgcn/configure | 4942 -----------------------
> newlib/libc/sys/amdgcn/configure.ac | 13 -
> newlib/libc/sys/arm/Makefile.am | 3 -
> newlib/libc/sys/arm/Makefile.in | 165 +-
> newlib/libc/sys/arm/aclocal.m4 | 1109 -----
> newlib/libc/sys/arm/configure | 4942 -----------------------
> newlib/libc/sys/arm/configure.ac | 13 -
> newlib/libc/sys/d10v/Makefile.am | 3 -
> newlib/libc/sys/d10v/Makefile.in | 165 +-
> newlib/libc/sys/d10v/aclocal.m4 | 1109 -----
> newlib/libc/sys/d10v/configure | 4942 -----------------------
> newlib/libc/sys/d10v/configure.ac | 13 -
> newlib/libc/sys/decstation/Makefile.am | 3 -
> newlib/libc/sys/decstation/Makefile.in | 154 +-
> newlib/libc/sys/decstation/aclocal.m4 | 1109 -----
> newlib/libc/sys/decstation/configure | 4942 -----------------------
> newlib/libc/sys/decstation/configure.ac | 13 -
> newlib/libc/sys/epiphany/Makefile.am | 3 -
> newlib/libc/sys/epiphany/Makefile.in | 139 +-
> newlib/libc/sys/epiphany/aclocal.m4 | 1109 -----
> newlib/libc/sys/epiphany/configure | 4942 -----------------------
> newlib/libc/sys/epiphany/configure.ac | 40 -
> newlib/libc/sys/h8300hms/Makefile.am | 3 -
> newlib/libc/sys/h8300hms/Makefile.in | 165 +-
> newlib/libc/sys/h8300hms/aclocal.m4 | 1109 -----
> newlib/libc/sys/h8300hms/configure | 4942 -----------------------
> newlib/libc/sys/h8300hms/configure.ac | 13 -
> newlib/libc/sys/h8500hms/Makefile.am | 3 -
> newlib/libc/sys/h8500hms/Makefile.in | 150 +-
> newlib/libc/sys/h8500hms/aclocal.m4 | 1109 -----
> newlib/libc/sys/h8500hms/configure | 4942 -----------------------
> newlib/libc/sys/h8500hms/configure.ac | 13 -
> newlib/libc/sys/m88kbug/Makefile.am | 3 -
> newlib/libc/sys/m88kbug/Makefile.in | 150 +-
> newlib/libc/sys/m88kbug/aclocal.m4 | 1109 -----
> newlib/libc/sys/m88kbug/configure | 4942 -----------------------
> newlib/libc/sys/m88kbug/configure.ac | 13 -
> newlib/libc/sys/mmixware/Makefile.am | 3 -
> newlib/libc/sys/mmixware/Makefile.in | 165 +-
> newlib/libc/sys/mmixware/aclocal.m4 | 1109 -----
> newlib/libc/sys/mmixware/configure | 4942 -----------------------
> newlib/libc/sys/mmixware/configure.ac | 13 -
> newlib/libc/sys/netware/Makefile.am | 3 -
> newlib/libc/sys/netware/Makefile.in | 154 +-
> newlib/libc/sys/netware/aclocal.m4 | 1109 -----
> newlib/libc/sys/netware/configure | 4942 -----------------------
> newlib/libc/sys/netware/configure.ac | 13 -
> newlib/libc/sys/or1k/Makefile.am | 3 -
> newlib/libc/sys/or1k/Makefile.in | 154 +-
> newlib/libc/sys/or1k/aclocal.m4 | 1109 -----
> newlib/libc/sys/or1k/configure | 4942 -----------------------
> newlib/libc/sys/or1k/configure.ac | 13 -
> newlib/libc/sys/rdos/Makefile.am | 3 -
> newlib/libc/sys/rdos/Makefile.in | 165 +-
> newlib/libc/sys/rdos/aclocal.m4 | 1109 -----
> newlib/libc/sys/rdos/configure | 4942 -----------------------
> newlib/libc/sys/rdos/configure.ac | 13 -
> newlib/libc/sys/rtems/Makefile.am | 3 -
> newlib/libc/sys/rtems/Makefile.in | 150 +-
> newlib/libc/sys/rtems/aclocal.m4 | 1109 -----
> newlib/libc/sys/rtems/configure | 4942 -----------------------
> newlib/libc/sys/rtems/configure.ac | 13 -
> newlib/libc/sys/sh/Makefile.am | 3 -
> newlib/libc/sys/sh/Makefile.in | 165 +-
> newlib/libc/sys/sh/aclocal.m4 | 1109 -----
> newlib/libc/sys/sh/configure | 4942 -----------------------
> newlib/libc/sys/sh/configure.ac | 13 -
> newlib/libc/sys/sparc64/Makefile.am | 3 -
> newlib/libc/sys/sparc64/Makefile.in | 161 +-
> newlib/libc/sys/sparc64/aclocal.m4 | 1109 -----
> newlib/libc/sys/sparc64/configure | 4942 -----------------------
> newlib/libc/sys/sparc64/configure.ac | 13 -
> newlib/libc/sys/sun4/Makefile.am | 3 -
> newlib/libc/sys/sun4/Makefile.in | 150 +-
> newlib/libc/sys/sun4/aclocal.m4 | 1109 -----
> newlib/libc/sys/sun4/configure | 4942 -----------------------
> newlib/libc/sys/sun4/configure.ac | 13 -
> newlib/libc/sys/sysmec/Makefile.am | 3 -
> newlib/libc/sys/sysmec/Makefile.in | 165 +-
> newlib/libc/sys/sysmec/aclocal.m4 | 1109 -----
> newlib/libc/sys/sysmec/configure | 4942 -----------------------
> newlib/libc/sys/sysmec/configure.ac | 13 -
> newlib/libc/sys/sysnec810/Makefile.am | 3 -
> newlib/libc/sys/sysnec810/Makefile.in | 165 +-
> newlib/libc/sys/sysnec810/aclocal.m4 | 1109 -----
> newlib/libc/sys/sysnec810/configure | 4942 -----------------------
> newlib/libc/sys/sysnec810/configure.ac | 13 -
> newlib/libc/sys/sysnecv850/Makefile.am | 3 -
> newlib/libc/sys/sysnecv850/Makefile.in | 165 +-
> newlib/libc/sys/sysnecv850/aclocal.m4 | 1109 -----
> newlib/libc/sys/sysnecv850/configure | 4942 -----------------------
> newlib/libc/sys/sysnecv850/configure.ac | 13 -
> newlib/libc/sys/sysvi386/Makefile.am | 3 -
> newlib/libc/sys/sysvi386/Makefile.in | 165 +-
> newlib/libc/sys/sysvi386/aclocal.m4 | 1109 -----
> newlib/libc/sys/sysvi386/configure | 4942 -----------------------
> newlib/libc/sys/sysvi386/configure.ac | 13 -
> newlib/libc/sys/sysvnecv70/Makefile.am | 3 -
> newlib/libc/sys/sysvnecv70/Makefile.in | 165 +-
> newlib/libc/sys/sysvnecv70/aclocal.m4 | 1109 -----
> newlib/libc/sys/sysvnecv70/configure | 4942 -----------------------
> newlib/libc/sys/sysvnecv70/configure.ac | 13 -
> newlib/libc/sys/tic80/Makefile.am | 3 -
> newlib/libc/sys/tic80/Makefile.in | 154 +-
> newlib/libc/sys/tic80/aclocal.m4 | 1109 -----
> newlib/libc/sys/tic80/configure | 4942 -----------------------
> newlib/libc/sys/tic80/configure.ac | 13 -
> newlib/libc/sys/tirtos/Makefile.am | 3 -
> newlib/libc/sys/tirtos/Makefile.in | 139 +-
> newlib/libc/sys/tirtos/aclocal.m4 | 1109 -----
> newlib/libc/sys/tirtos/configure | 4942 -----------------------
> newlib/libc/sys/tirtos/configure.ac | 13 -
> newlib/libc/sys/w65/Makefile.am | 3 -
> newlib/libc/sys/w65/Makefile.in | 150 +-
> newlib/libc/sys/w65/aclocal.m4 | 1109 -----
> newlib/libc/sys/w65/configure | 4942 -----------------------
> newlib/libc/sys/w65/configure.ac | 13 -
> newlib/libc/sys/z8ksim/Makefile.am | 3 -
> newlib/libc/sys/z8ksim/Makefile.in | 150 +-
> newlib/libc/sys/z8ksim/aclocal.m4 | 1109 -----
> newlib/libc/sys/z8ksim/configure | 4942 -----------------------
> newlib/libc/sys/z8ksim/configure.ac | 13 -
> 132 files changed, 2726 insertions(+), 159285 deletions(-)
> delete mode 100644 newlib/libc/sys/a29khif/aclocal.m4
> delete mode 100755 newlib/libc/sys/a29khif/configure
> delete mode 100644 newlib/libc/sys/a29khif/configure.ac
> delete mode 100644 newlib/libc/sys/amdgcn/aclocal.m4
> delete mode 100755 newlib/libc/sys/amdgcn/configure
> delete mode 100644 newlib/libc/sys/amdgcn/configure.ac
> delete mode 100644 newlib/libc/sys/arm/aclocal.m4
> delete mode 100755 newlib/libc/sys/arm/configure
> delete mode 100644 newlib/libc/sys/arm/configure.ac
> delete mode 100644 newlib/libc/sys/d10v/aclocal.m4
> delete mode 100755 newlib/libc/sys/d10v/configure
> delete mode 100644 newlib/libc/sys/d10v/configure.ac
> delete mode 100644 newlib/libc/sys/decstation/aclocal.m4
> delete mode 100755 newlib/libc/sys/decstation/configure
> delete mode 100644 newlib/libc/sys/decstation/configure.ac
> delete mode 100644 newlib/libc/sys/epiphany/aclocal.m4
> delete mode 100755 newlib/libc/sys/epiphany/configure
> delete mode 100644 newlib/libc/sys/epiphany/configure.ac
> delete mode 100644 newlib/libc/sys/h8300hms/aclocal.m4
> delete mode 100755 newlib/libc/sys/h8300hms/configure
> delete mode 100644 newlib/libc/sys/h8300hms/configure.ac
> delete mode 100644 newlib/libc/sys/h8500hms/aclocal.m4
> delete mode 100755 newlib/libc/sys/h8500hms/configure
> delete mode 100644 newlib/libc/sys/h8500hms/configure.ac
> delete mode 100644 newlib/libc/sys/m88kbug/aclocal.m4
> delete mode 100755 newlib/libc/sys/m88kbug/configure
> delete mode 100644 newlib/libc/sys/m88kbug/configure.ac
> delete mode 100644 newlib/libc/sys/mmixware/aclocal.m4
> delete mode 100755 newlib/libc/sys/mmixware/configure
> delete mode 100644 newlib/libc/sys/mmixware/configure.ac
> delete mode 100644 newlib/libc/sys/netware/aclocal.m4
> delete mode 100755 newlib/libc/sys/netware/configure
> delete mode 100644 newlib/libc/sys/netware/configure.ac
> delete mode 100644 newlib/libc/sys/or1k/aclocal.m4
> delete mode 100755 newlib/libc/sys/or1k/configure
> delete mode 100644 newlib/libc/sys/or1k/configure.ac
> delete mode 100644 newlib/libc/sys/rdos/aclocal.m4
> delete mode 100755 newlib/libc/sys/rdos/configure
> delete mode 100644 newlib/libc/sys/rdos/configure.ac
> delete mode 100644 newlib/libc/sys/rtems/aclocal.m4
> delete mode 100755 newlib/libc/sys/rtems/configure
> delete mode 100644 newlib/libc/sys/rtems/configure.ac
> delete mode 100644 newlib/libc/sys/sh/aclocal.m4
> delete mode 100755 newlib/libc/sys/sh/configure
> delete mode 100644 newlib/libc/sys/sh/configure.ac
> delete mode 100644 newlib/libc/sys/sparc64/aclocal.m4
> delete mode 100755 newlib/libc/sys/sparc64/configure
> delete mode 100644 newlib/libc/sys/sparc64/configure.ac
> delete mode 100644 newlib/libc/sys/sun4/aclocal.m4
> delete mode 100755 newlib/libc/sys/sun4/configure
> delete mode 100644 newlib/libc/sys/sun4/configure.ac
> delete mode 100644 newlib/libc/sys/sysmec/aclocal.m4
> delete mode 100755 newlib/libc/sys/sysmec/configure
> delete mode 100644 newlib/libc/sys/sysmec/configure.ac
> delete mode 100644 newlib/libc/sys/sysnec810/aclocal.m4
> delete mode 100755 newlib/libc/sys/sysnec810/configure
> delete mode 100644 newlib/libc/sys/sysnec810/configure.ac
> delete mode 100644 newlib/libc/sys/sysnecv850/aclocal.m4
> delete mode 100755 newlib/libc/sys/sysnecv850/configure
> delete mode 100644 newlib/libc/sys/sysnecv850/configure.ac
> delete mode 100644 newlib/libc/sys/sysvi386/aclocal.m4
> delete mode 100755 newlib/libc/sys/sysvi386/configure
> delete mode 100644 newlib/libc/sys/sysvi386/configure.ac
> delete mode 100644 newlib/libc/sys/sysvnecv70/aclocal.m4
> delete mode 100755 newlib/libc/sys/sysvnecv70/configure
> delete mode 100644 newlib/libc/sys/sysvnecv70/configure.ac
> delete mode 100644 newlib/libc/sys/tic80/aclocal.m4
> delete mode 100755 newlib/libc/sys/tic80/configure
> delete mode 100644 newlib/libc/sys/tic80/configure.ac
> delete mode 100644 newlib/libc/sys/tirtos/aclocal.m4
> delete mode 100755 newlib/libc/sys/tirtos/configure
> delete mode 100644 newlib/libc/sys/tirtos/configure.ac
> delete mode 100644 newlib/libc/sys/w65/aclocal.m4
> delete mode 100755 newlib/libc/sys/w65/configure
> delete mode 100644 newlib/libc/sys/w65/configure.ac
> delete mode 100644 newlib/libc/sys/z8ksim/aclocal.m4
> delete mode 100755 newlib/libc/sys/z8ksim/configure
> delete mode 100644 newlib/libc/sys/z8ksim/configure.ac
>
> diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
> index 8ca783d84a85..436dd4070ec8 100644
> --- a/newlib/libc/configure.ac
> +++ b/newlib/libc/configure.ac
> @@ -166,34 +166,34 @@ dnl do. However, we do need to know whether they will produce a library.
> LIBC_SYS_LIB=
> if test -n "${sys_dir}"; then
> case ${sys_dir} in
> - a29khif) AC_CONFIG_SUBDIRS(sys/a29khif) ;;
> - amdgcn) AC_CONFIG_SUBDIRS(sys/amdgcn) ;;
> - arm) AC_CONFIG_SUBDIRS(sys/arm) ;;
> - d10v) AC_CONFIG_SUBDIRS(sys/d10v) ;;
> - decstation) AC_CONFIG_SUBDIRS(sys/decstation) ;;
> - epiphany) AC_CONFIG_SUBDIRS(sys/epiphany) ;;
> - h8300hms) AC_CONFIG_SUBDIRS(sys/h8300hms) ;;
> - h8500hms) AC_CONFIG_SUBDIRS(sys/h8500hms) ;;
> + a29khif) AC_CONFIG_FILES([sys/a29khif/Makefile]) ;;
> + amdgcn) AC_CONFIG_FILES([sys/amdgcn/Makefile]) ;;
> + arm) AC_CONFIG_FILES([sys/arm/Makefile]) ;;
> + d10v) AC_CONFIG_FILES([sys/d10v/Makefile]) ;;
> + decstation) AC_CONFIG_FILES([sys/decstation/Makefile]) ;;
> + epiphany) AC_CONFIG_FILES([sys/epiphany/Makefile]) ;;
> + h8300hms) AC_CONFIG_FILES([sys/h8300hms/Makefile]) ;;
> + h8500hms) AC_CONFIG_FILES([sys/h8500hms/Makefile]) ;;
> linux) AC_CONFIG_SUBDIRS(sys/linux) ;;
> - m88kbug) AC_CONFIG_SUBDIRS(sys/m88kbug) ;;
> - mmixware) AC_CONFIG_SUBDIRS(sys/mmixware) ;;
> - netware) AC_CONFIG_SUBDIRS(sys/netware) ;;
> - or1k) AC_CONFIG_SUBDIRS(sys/or1k) ;;
> + m88kbug) AC_CONFIG_FILES([sys/m88kbug/Makefile]) ;;
> + mmixware) AC_CONFIG_FILES([sys/mmixware/Makefile]) ;;
> + netware) AC_CONFIG_FILES([sys/netware/Makefile]) ;;
> + or1k) AC_CONFIG_FILES([sys/or1k/Makefile]) ;;
> phoenix) AC_CONFIG_SUBDIRS(sys/phoenix) ;;
> - rdos) AC_CONFIG_SUBDIRS(sys/rdos) ;;
> - rtems) AC_CONFIG_SUBDIRS(sys/rtems) ;;
> - sh) AC_CONFIG_SUBDIRS(sys/sh) ;;
> - sparc64) AC_CONFIG_SUBDIRS(sys/sparc64) ;;
> - sun4) AC_CONFIG_SUBDIRS(sys/sun4) ;;
> - sysmec) AC_CONFIG_SUBDIRS(sys/sysmec) ;;
> - sysnec810) AC_CONFIG_SUBDIRS(sys/sysnec810) ;;
> - sysnecv850) AC_CONFIG_SUBDIRS(sys/sysnecv850) ;;
> - sysvi386) AC_CONFIG_SUBDIRS(sys/sysvi386) ;;
> - sysvnecv70) AC_CONFIG_SUBDIRS(sys/sysvnecv70) ;;
> - tic80) AC_CONFIG_SUBDIRS(sys/tic80) ;;
> - tirtos) AC_CONFIG_SUBDIRS(sys/tirtos) ;;
> - w65) AC_CONFIG_SUBDIRS(sys/w65) ;;
> - z8ksim) AC_CONFIG_SUBDIRS(sys/z8ksim) ;;
> + rdos) AC_CONFIG_FILES([sys/rdos/Makefile]) ;;
> + rtems) AC_CONFIG_FILES([sys/rtems/Makefile]) ;;
> + sh) AC_CONFIG_FILES([sys/sh/Makefile]) ;;
> + sparc64) AC_CONFIG_FILES([sys/sparc64/Makefile]) ;;
> + sun4) AC_CONFIG_FILES([sys/sun4/Makefile]) ;;
> + sysmec) AC_CONFIG_FILES([sys/sysmec/Makefile]) ;;
> + sysnec810) AC_CONFIG_FILES([sys/sysnec810/Makefile]) ;;
> + sysnecv850) AC_CONFIG_FILES([sys/sysnecv850/Makefile]) ;;
> + sysvi386) AC_CONFIG_FILES([sys/sysvi386/Makefile]) ;;
> + sysvnecv70) AC_CONFIG_FILES([sys/sysvnecv70/Makefile]) ;;
> + tic80) AC_CONFIG_FILES([sys/tic80/Makefile]) ;;
> + tirtos) AC_CONFIG_FILES([sys/tirtos/Makefile]) ;;
> + w65) AC_CONFIG_FILES([sys/w65/Makefile]) ;;
> + z8ksim) AC_CONFIG_FILES([sys/z8ksim/Makefile]) ;;
> *) AC_MSG_ERROR([unsupported sys_dir "${sys_dir}"]) ;;
> esac
>
> diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
> index 6e973bc92732..f2e8644f8726 100644
> --- a/newlib/libc/sys/a29khif/Makefile.am
> +++ b/newlib/libc/sys/a29khif/Makefile.am
> @@ -45,6 +45,3 @@ lib_a_SOURCES = \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
> index ad2eaa710385..87f63301a5c4 100644
> --- a/newlib/libc/sys/amdgcn/Makefile.am
> +++ b/newlib/libc/sys/amdgcn/Makefile.am
> @@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
> lib_a_SOURCES = close.c fstat.c isatty.c lseek.c read.c write.c \
> fcntl.c getpid.c kill.c open.c raise.c stat.c unlink.c
> lib_a_CFLAGS = $(AM_CFLAGS)
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
> index 9aa9eafc22a3..b88c30c5a5ee 100644
> --- a/newlib/libc/sys/arm/Makefile.am
> +++ b/newlib/libc/sys/arm/Makefile.am
> @@ -21,6 +21,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
> if MAY_SUPPLY_SYSCALLS
> all-local: crt0.o
> endif
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
> index 5a6d300ea259..50866743a048 100644
> --- a/newlib/libc/sys/d10v/Makefile.am
> +++ b/newlib/libc/sys/d10v/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
> index 0cb245e8e412..22a2fa7d7008 100644
> --- a/newlib/libc/sys/decstation/Makefile.am
> +++ b/newlib/libc/sys/decstation/Makefile.am
> @@ -40,6 +40,3 @@ all-local: crt0.o
>
> crt0.o:
> cp /lib/crt0.o crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
> index 0b6ee6e8c620..5448105206db 100644
> --- a/newlib/libc/sys/epiphany/Makefile.am
> +++ b/newlib/libc/sys/epiphany/Makefile.am
> @@ -35,6 +35,3 @@ noinst_LIBRARIES = lib.a
> # crt0.o comes from libgloss
> lib_a_SOURCES = e_printf.c
> lib_a_CFLAGS = $(AM_CFLAGS)
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
> index 3e87cf66c2c3..634c9071eb5b 100644
> --- a/newlib/libc/sys/h8300hms/Makefile.am
> +++ b/newlib/libc/sys/h8300hms/Makefile.am
> @@ -11,6 +11,3 @@ lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
> index 7ebe8544a348..57abb9f29199 100644
> --- a/newlib/libc/sys/h8500hms/Makefile.am
> +++ b/newlib/libc/sys/h8500hms/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c misc.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
> index e94eaabd62af..60967d846dbf 100644
> --- a/newlib/libc/sys/m88kbug/Makefile.am
> +++ b/newlib/libc/sys/m88kbug/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
> index 0d43c1dc8fe9..24b0eccf39e5 100644
> --- a/newlib/libc/sys/mmixware/Makefile.am
> +++ b/newlib/libc/sys/mmixware/Makefile.am
> @@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
> index 79b13a2efbe8..d2f1fec50dfa 100644
> --- a/newlib/libc/sys/netware/Makefile.am
> +++ b/newlib/libc/sys/netware/Makefile.am
> @@ -11,6 +11,3 @@ lib_a_SOURCES = \
> link.c
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
> index 3e149461c426..88f2c1eccbd1 100644
> --- a/newlib/libc/sys/or1k/Makefile.am
> +++ b/newlib/libc/sys/or1k/Makefile.am
> @@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
>
> lib_a_SOURCES = getreent.S mlock.c
> lib_a_CFLAGS=$(AM_CFLAGS)
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
> index 05c093d1ff19..0bc1d26fd1ee 100644
> --- a/newlib/libc/sys/rdos/Makefile.am
> +++ b/newlib/libc/sys/rdos/Makefile.am
> @@ -13,6 +13,3 @@ lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
> index 215de8ac0896..d1604295676f 100644
> --- a/newlib/libc/sys/rtems/Makefile.am
> +++ b/newlib/libc/sys/rtems/Makefile.am
> @@ -11,9 +11,6 @@ lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
>
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> -
> install-data-local:
> $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
> for i in $(srcdir)/include/arpa/*.h; do \
> diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
> index 21cacb426e57..6dc19fe43dfa 100644
> --- a/newlib/libc/sys/sh/Makefile.am
> +++ b/newlib/libc/sys/sh/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
> index ef9c64577099..f2437ba6680c 100644
> --- a/newlib/libc/sys/sparc64/Makefile.am
> +++ b/newlib/libc/sys/sparc64/Makefile.am
> @@ -114,6 +114,3 @@ unlink_r.o: unlink.S
> wait_r.o: wait.S
> wait4_r.o: wait4.S
> write_r.o: write.S
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
> index 1d4fe967b6ae..13f4745b09ff 100644
> --- a/newlib/libc/sys/sun4/Makefile.am
> +++ b/newlib/libc/sys/sun4/Makefile.am
> @@ -91,6 +91,3 @@ all-local: crt0.o
>
> crt0.o:
> cp /lib/crt0.o crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
> index c6902a9ca832..815ebcd689b2 100644
> --- a/newlib/libc/sys/sysmec/Makefile.am
> +++ b/newlib/libc/sys/sysmec/Makefile.am
> @@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
> index baf7d848355d..d62fd8b3a72c 100644
> --- a/newlib/libc/sys/sysnec810/Makefile.am
> +++ b/newlib/libc/sys/sysnec810/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = io.S write.c sbrk.c misc.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
> index 06ac517b87f8..bd8474fcbfd6 100644
> --- a/newlib/libc/sys/sysnecv850/Makefile.am
> +++ b/newlib/libc/sys/sysnecv850/Makefile.am
> @@ -33,6 +33,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
> if MAY_SUPPLY_SYSCALLS
> all-local: crt0.o
> endif
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
> index 15284ca42297..03bc72d2f011 100644
> --- a/newlib/libc/sys/sysvi386/Makefile.am
> +++ b/newlib/libc/sys/sysvi386/Makefile.am
> @@ -19,6 +19,3 @@ lib_a_SOURCES = \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
> index f27364087271..e5618f961707 100644
> --- a/newlib/libc/sys/sysvnecv70/Makefile.am
> +++ b/newlib/libc/sys/sysvnecv70/Makefile.am
> @@ -11,6 +11,3 @@ lib_a_SOURCES = ioctl.S isatty.S read.S lseek.S close.S sbrk.S fstat.S \
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
> index 2027dda7aea7..0f3a5555bfa1 100644
> --- a/newlib/libc/sys/tic80/Makefile.am
> +++ b/newlib/libc/sys/tic80/Makefile.am
> @@ -15,6 +15,3 @@ EXTRA_LIBRARIES = libfoo.a
> libfoo_a_SOURCES = crt0.c
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
> index c8a2d42eeeb7..c9f73119b025 100644
> --- a/newlib/libc/sys/tirtos/Makefile.am
> +++ b/newlib/libc/sys/tirtos/Makefile.am
> @@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
>
> lib_a_SOURCES = lock.c
> lib_a_CFLAGS = $(AM_CFLAGS)
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
> index adba49696f2e..e58f2ecd5701 100644
> --- a/newlib/libc/sys/w65/Makefile.am
> +++ b/newlib/libc/sys/w65/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
> diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
> index 6f90a0c09280..0c6706ff60ef 100644
> --- a/newlib/libc/sys/z8ksim/Makefile.am
> +++ b/newlib/libc/sys/z8ksim/Makefile.am
> @@ -10,6 +10,3 @@ lib_a_SOURCES = glue.c
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> all-local: crt0.o
> -
> -ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
> -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
^ permalink raw reply [flat|nested] 19+ messages in thread* arm-eabi fails in libc/sys/arm/: No rule to make target 'lib_a-trap.o', needed by 'lib.a'.
2022-01-31 16:08 ` Richard Earnshaw
@ 2022-02-01 4:49 ` Mike Frysinger
2022-02-03 16:49 ` Richard Earnshaw
0 siblings, 1 reply; 19+ messages in thread
From: Mike Frysinger @ 2022-02-01 4:49 UTC (permalink / raw)
To: Richard Earnshaw, Jeff Johnston; +Cc: newlib
[-- Attachment #1: Type: text/plain, Size: 2560 bytes --]
On 31 Jan 2022 16:08, Richard Earnshaw wrote:
> This patch seems to have broken arm newlib builds (at least, when not
> using libgloss). I'm seeing:
>
> make[5]: Entering directory
> '/work/rearnsha/scratch/nightly/arm/master/arm-eabi/
> newlib/libc/sys/arm'
> CC lib_a-access.o
> CC lib_a-aeabi_atexit.o
> make[5]: *** No rule to make target 'lib_a-trap.o', needed by 'lib.a'. Stop.
>
> And indeed, the Makefile in that directory now lacks anything to build
> lib_a-trap.o from trap.S. Something explicit is needed because of the
> non-standard file rename that we use.
this patch series is unrelated. this is due to a previous patch of mine:
newlib: delete (most) redundant lib_a_CCASFLAGS=$(AM_CCASFLAGS)
this is because i think newlib was relying on automake behavior that is
undocumented or unintended. that said, i'm not sure why this Makefile.am
is written the way it is. it'd be a lot simpler like:
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -6,16 +6,10 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
noinst_LIBRARIES = lib.a
+lib_a_SOURCES = access.c aeabi_atexit.c
if MAY_SUPPLY_SYSCALLS
-extra_objs = $(lpfx)libcfunc.o $(lpfx)trap.o $(lpfx)syscalls.o
-else
-extra_objs =
+lib_a_SOURCES += libcfunc.c trap.S syscalls.c
endif
-
-lib_a_SOURCES = access.c aeabi_atexit.c
-lib_a_LIBADD = $(extra_objs)
-EXTRA_lib_a_SOURCES = trap.S syscalls.c libcfunc.c
-lib_a_DEPENDENCIES = $(extra_objs)
lib_a_CFLAGS = $(AM_CFLAGS)
if MAY_SUPPLY_SYSCALLS
maybe Jeff can remember why it was written this way since it comes from:
commit 313f13497935d2831e76f9b8b61ccc762dc1cc65
Author: Jeff Johnston <jjohnstn@redhat.com>
Date: Sat Feb 8 04:30:58 2003 +0000
2003-02-07 Jeff Johnston <jjohnstn@redhat.com>
* acinclude.m4 (--disable-newlib-supplied-syscalls): New configuration
option to allow disabling of syscalls being supplied in newlib.
* aclocal.m4: Regenerated.
* configure: Ditto.
* configure.host: Add support of new configuration option and add
-D__NO_SYSCALLS__ if newlib supplied syscalls are disabled.
* doc/aclocal.m4: Regenerated.
* doc/configure: Ditto.
* libc/*aclocal.m4: Ditto.
* libc/*configure: Ditto.
* libm/*aclocal.m4: Ditto.
* libm/*configure: Ditto.
* libc/sys/arm/Makefile.am: Don't build syscalls.o if new option
is disabled.
-mike
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: arm-eabi fails in libc/sys/arm/: No rule to make target 'lib_a-trap.o', needed by 'lib.a'.
2022-02-01 4:49 ` arm-eabi fails in libc/sys/arm/: No rule to make target 'lib_a-trap.o', needed by 'lib.a' Mike Frysinger
@ 2022-02-03 16:49 ` Richard Earnshaw
2022-02-04 1:44 ` Mike Frysinger
0 siblings, 1 reply; 19+ messages in thread
From: Richard Earnshaw @ 2022-02-03 16:49 UTC (permalink / raw)
To: Jeff Johnston, newlib
On 01/02/2022 04:49, Mike Frysinger wrote:
> On 31 Jan 2022 16:08, Richard Earnshaw wrote:
>> This patch seems to have broken arm newlib builds (at least, when not
>> using libgloss). I'm seeing:
>>
>> make[5]: Entering directory
>> '/work/rearnsha/scratch/nightly/arm/master/arm-eabi/
>> newlib/libc/sys/arm'
>> CC lib_a-access.o
>> CC lib_a-aeabi_atexit.o
>> make[5]: *** No rule to make target 'lib_a-trap.o', needed by 'lib.a'. Stop.
>>
>> And indeed, the Makefile in that directory now lacks anything to build
>> lib_a-trap.o from trap.S. Something explicit is needed because of the
>> non-standard file rename that we use.
>
> this patch series is unrelated. this is due to a previous patch of mine:
> newlib: delete (most) redundant lib_a_CCASFLAGS=$(AM_CCASFLAGS)
>
Ah, sorry, I was struggling to identify the exact patch and thought I'd
found the right one.
> this is because i think newlib was relying on automake behavior that is
> undocumented or unintended. that said, i'm not sure why this Makefile.am
> is written the way it is. it'd be a lot simpler like:
>
> --- a/newlib/libc/sys/arm/Makefile.am
> +++ b/newlib/libc/sys/arm/Makefile.am
> @@ -6,16 +6,10 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
>
> noinst_LIBRARIES = lib.a
>
> +lib_a_SOURCES = access.c aeabi_atexit.c
> if MAY_SUPPLY_SYSCALLS
> -extra_objs = $(lpfx)libcfunc.o $(lpfx)trap.o $(lpfx)syscalls.o
> -else
> -extra_objs =
> +lib_a_SOURCES += libcfunc.c trap.S syscalls.c
> endif
> -
> -lib_a_SOURCES = access.c aeabi_atexit.c
> -lib_a_LIBADD = $(extra_objs)
> -EXTRA_lib_a_SOURCES = trap.S syscalls.c libcfunc.c
> -lib_a_DEPENDENCIES = $(extra_objs)
> lib_a_CFLAGS = $(AM_CFLAGS)
>
> if MAY_SUPPLY_SYSCALLS
This seems to work although one small difference is that instead of
building libc_a-trap.o it now builds trap.o. I'm not sure if that
really matters, though.
R.
>
> maybe Jeff can remember why it was written this way since it comes from:
>
> commit 313f13497935d2831e76f9b8b61ccc762dc1cc65
> Author: Jeff Johnston <jjohnstn@redhat.com>
> Date: Sat Feb 8 04:30:58 2003 +0000
>
> 2003-02-07 Jeff Johnston <jjohnstn@redhat.com>
>
> * acinclude.m4 (--disable-newlib-supplied-syscalls): New configuration
> option to allow disabling of syscalls being supplied in newlib.
> * aclocal.m4: Regenerated.
> * configure: Ditto.
> * configure.host: Add support of new configuration option and add
> -D__NO_SYSCALLS__ if newlib supplied syscalls are disabled.
> * doc/aclocal.m4: Regenerated.
> * doc/configure: Ditto.
> * libc/*aclocal.m4: Ditto.
> * libc/*configure: Ditto.
> * libm/*aclocal.m4: Ditto.
> * libm/*configure: Ditto.
> * libc/sys/arm/Makefile.am: Don't build syscalls.o if new option
> is disabled.
> -mike
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: arm-eabi fails in libc/sys/arm/: No rule to make target 'lib_a-trap.o', needed by 'lib.a'.
2022-02-03 16:49 ` Richard Earnshaw
@ 2022-02-04 1:44 ` Mike Frysinger
0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-02-04 1:44 UTC (permalink / raw)
To: Richard Earnshaw; +Cc: Jeff Johnston, newlib
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
On 03 Feb 2022 16:49, Richard Earnshaw wrote:
> On 01/02/2022 04:49, Mike Frysinger wrote:
> > this is because i think newlib was relying on automake behavior that is
> > undocumented or unintended. that said, i'm not sure why this Makefile.am
> > is written the way it is. it'd be a lot simpler like:
> >
> > --- a/newlib/libc/sys/arm/Makefile.am
> > +++ b/newlib/libc/sys/arm/Makefile.am
> > @@ -6,16 +6,10 @@ AM_CCASFLAGS = $(AM_CPPFLAGS)
> >
> > noinst_LIBRARIES = lib.a
> >
> > +lib_a_SOURCES = access.c aeabi_atexit.c
> > if MAY_SUPPLY_SYSCALLS
> > -extra_objs = $(lpfx)libcfunc.o $(lpfx)trap.o $(lpfx)syscalls.o
> > -else
> > -extra_objs =
> > +lib_a_SOURCES += libcfunc.c trap.S syscalls.c
> > endif
> > -
> > -lib_a_SOURCES = access.c aeabi_atexit.c
> > -lib_a_LIBADD = $(extra_objs)
> > -EXTRA_lib_a_SOURCES = trap.S syscalls.c libcfunc.c
> > -lib_a_DEPENDENCIES = $(extra_objs)
> > lib_a_CFLAGS = $(AM_CFLAGS)
> >
> > if MAY_SUPPLY_SYSCALLS
>
> This seems to work although one small difference is that instead of
> building libc_a-trap.o it now builds trap.o. I'm not sure if that
> really matters, though.
right, the .S files don't have the prefix on the filename anymore. i noticed
that and looked through the tree and couldn't see why it would be a problem.
there is one or two places where the exact object file name is used (the
MATHOBJS_IN_LIBC which pulls a small number of libm objects out to copy into
libc.a).
i'm going to push the fix now and we can revisit if someone points out a
problem with it.
-mike
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 7/7] newlib: libc: merge machine/ configure scripts up a level
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
` (5 preceding siblings ...)
2022-01-23 6:04 ` [PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level Mike Frysinger
@ 2022-01-23 6:04 ` Mike Frysinger
2022-01-25 13:58 ` [PATCH 0/7] newlib: reduce number of configure scripts Corinna Vinschen
7 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger @ 2022-01-23 6:04 UTC (permalink / raw)
To: newlib
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 0/7] newlib: reduce number of configure scripts
2022-01-23 6:04 [PATCH 0/7] newlib: reduce number of configure scripts Mike Frysinger
` (6 preceding siblings ...)
2022-01-23 6:04 ` [PATCH 7/7] newlib: libc: merge machine/ configure scripts up a level Mike Frysinger
@ 2022-01-25 13:58 ` Corinna Vinschen
7 siblings, 0 replies; 19+ messages in thread
From: Corinna Vinschen @ 2022-01-25 13:58 UTC (permalink / raw)
To: newlib
On Jan 23 01:04, Mike Frysinger wrote:
> This flattens the recursive configure logic quite a bit in the newlib
> tree. I'll let the delta speak for itself.
>
> Before:
> $ find newlib/ -name configure | wc -l
> 113
> After:
> $ find newlib/ -name configure | wc -l
> 13
>
> The strategy largely is about killing off most of the stub configure
> trampolines in the libm & libc machine/ & sys/ trees. I think of those
> 100 scripts, only 5 were doing something unique (checking preprocessor
> defines), while all the rest existed purely to generate a Makefile. If
> we move that makefile generation logic into the respective top-level
> dirs, we can kill off entire subpaths.
>
> Considering how messy the remaining libc/ sys/phoenix/ and sys/linux/
> subdirs are, and I don't use or care about those targets, I don't think
> I'll try and fold the libc/ confiugre logic any more. But in spite of
> those, I think this patch series is a pretty big win without leaving
> the status quo in a bad way.
>
> Mike Frysinger (7):
> newlib: libm: merge machine/ trampoline up a level
> newlib: libm: merge machine/ configure scripts up a level
> newlib: libc: merge machine/ trampoline up a level
> newlib: libc: merge sys/ trampoline up a level
> newlib: libc: install CRT0 straight out of subdir
> newlib: libc: merge most sys/ configure scripts up a level
> newlib: libc: merge machine/ configure scripts up a level
I tested this additionally with Cygwin as target and from what I can
tell, this looks good. Please push.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 19+ messages in thread