[PATCH 1/7] newlib: move AC_NO_EXECUTABLES logic up to common code

Mike Frysinger vapier@gentoo.org
Sat Feb 5 07:34:30 GMT 2022


This logic was added to libc & libm to get it working again after some
reworks in the CPP handling, but now that that's settled, let's move
this to the common newlib configure logic.  This will make it easier
to consolidate all the configure calls into the top-level newlib dir.

This does create a lot of noise in the generate scripts, but that's
because of the ordering of the calls, not because of correctness. We
will try to draw that back down in follow up commits as we modernize
the toolchain calls in here.
---
 newlib/acinclude.m4                           |    3 +
 newlib/configure                              | 3828 +++++++++--------
 newlib/libc/configure                         | 3568 +++++++--------
 newlib/libc/configure.ac                      |    2 -
 newlib/libc/sys/linux/configure               | 3828 +++++++++--------
 newlib/libc/sys/linux/linuxthreads/configure  | 3828 +++++++++--------
 .../sys/linux/linuxthreads/machine/configure  | 3828 +++++++++--------
 .../linux/linuxthreads/machine/i386/configure | 3828 +++++++++--------
 newlib/libc/sys/linux/machine/configure       | 3828 +++++++++--------
 newlib/libc/sys/linux/machine/i386/configure  | 3828 +++++++++--------
 newlib/libc/sys/phoenix/Makefile.in           |    6 +
 newlib/libc/sys/phoenix/aclocal.m4            |   64 +
 newlib/libc/sys/phoenix/configure             | 1405 +++++-
 newlib/libc/sys/phoenix/machine/Makefile.in   |    6 +
 newlib/libc/sys/phoenix/machine/aclocal.m4    |   64 +
 .../libc/sys/phoenix/machine/arm/Makefile.in  |    6 +
 .../libc/sys/phoenix/machine/arm/aclocal.m4   |   64 +
 newlib/libc/sys/phoenix/machine/arm/configure | 1405 +++++-
 newlib/libc/sys/phoenix/machine/configure     | 1405 +++++-
 newlib/libm/configure                         | 3568 +++++++--------
 newlib/libm/configure.ac                      |    2 -
 21 files changed, 21391 insertions(+), 16973 deletions(-)

diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 888d417943e3..c851d622e942 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -118,6 +118,8 @@ AM_INIT_AUTOMAKE([foreign no-installinfo no-dependencies no-dist no-define subdi
 AM_MAINTAINER_MODE()
 AM_SILENT_RULES(yes)
 
+AC_NO_EXECUTABLES
+
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
 # are probably using a cross compiler, which will not be able to fully
@@ -180,6 +182,7 @@ fi
 ])
 
 LIB_AC_PROG_CC
+AC_REQUIRE([AC_PROG_CPP])dnl
 
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 14b6aa466cd3..c24021c1d539 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -45,9 +45,7 @@ AC_ARG_ENABLE(newlib-retargetable-locking,
  esac],[newlib_retargetable_locking=no])
 AM_CONDITIONAL(NEWLIB_RETARGETABLE_LOCKING, test x$newlib_retargetable_locking = xyes)
 
-AC_NO_EXECUTABLES
 NEWLIB_CONFIGURE(..)
-AC_PROG_CPP
 
 AM_CONDITIONAL(NEWLIB_NANO_MALLOC, test x$newlib_nano_malloc = xyes)
 
diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index a03ea3872bd5..e4611ed846dd 100644
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -16,9 +16,7 @@ AM_CONDITIONAL(NEWLIB_HW_FP, test x$newlib_hw_fp = xtrue)
 dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
 AC_CONFIG_AUX_DIR(../..)
 
-AC_NO_EXECUTABLES
 NEWLIB_CONFIGURE(..)
-AC_PROG_CPP
 
 dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
 dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-- 
2.34.1



More information about the Newlib mailing list