[PATCH 3/7] newlib: switch to standard AM_PROG_AS

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


Now that we require a recent automake version, rely on it to provide AS
and CCAS and CCASFLAGS for us.
---
 newlib/acinclude.m4                           |  11 +-
 newlib/aclocal.m4                             |  20 +++
 newlib/configure                              | 117 ++----------------
 newlib/libc/aclocal.m4                        |  20 +++
 newlib/libc/configure                         | 117 ++----------------
 newlib/libc/sys/linux/aclocal.m4              |  20 +++
 newlib/libc/sys/linux/configure               | 117 ++----------------
 newlib/libc/sys/linux/linuxthreads/aclocal.m4 |  20 +++
 newlib/libc/sys/linux/linuxthreads/configure  | 117 ++----------------
 .../sys/linux/linuxthreads/machine/aclocal.m4 |  20 +++
 .../sys/linux/linuxthreads/machine/configure  | 117 ++----------------
 .../linuxthreads/machine/i386/aclocal.m4      |  20 +++
 .../linux/linuxthreads/machine/i386/configure | 117 ++----------------
 newlib/libc/sys/linux/machine/aclocal.m4      |  20 +++
 newlib/libc/sys/linux/machine/configure       | 117 ++----------------
 newlib/libc/sys/linux/machine/i386/aclocal.m4 |  20 +++
 newlib/libc/sys/linux/machine/i386/configure  | 117 ++----------------
 newlib/libc/sys/phoenix/Makefile.in           |   1 -
 newlib/libc/sys/phoenix/aclocal.m4            |  20 +++
 newlib/libc/sys/phoenix/configure             | 112 ++---------------
 newlib/libc/sys/phoenix/machine/Makefile.in   |   1 -
 newlib/libc/sys/phoenix/machine/aclocal.m4    |  20 +++
 .../libc/sys/phoenix/machine/arm/Makefile.in  |   1 -
 .../libc/sys/phoenix/machine/arm/aclocal.m4   |  20 +++
 newlib/libc/sys/phoenix/machine/arm/configure | 112 ++---------------
 newlib/libc/sys/phoenix/machine/configure     | 112 ++---------------
 newlib/libm/aclocal.m4                        |  20 +++
 newlib/libm/configure                         | 117 ++----------------
 28 files changed, 376 insertions(+), 1267 deletions(-)

diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index a2a383335314..19e86f8691fe 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -120,18 +120,10 @@ AM_SILENT_RULES(yes)
 
 AC_NO_EXECUTABLES
 
-AC_DEFUN([LIB_AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-])
-
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_CPP])dnl
 
-AC_CHECK_TOOL(AS, as)
+AC_REQUIRE([AM_PROG_AS])dnl
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(READELF, readelf, :)
@@ -145,7 +137,6 @@ AC_REQUIRE([AC_PROG_AWK])dnl
 ac_given_INSTALL=$INSTALL
 
 AM_MAINTAINER_MODE
-LIB_AM_PROG_AS
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
 # at least currently, we never actually build a program, so we never
-- 
2.34.1



More information about the Newlib mailing list