[PATCH 5/6] newlib: drop support for $aext
Mike Frysinger
vapier@gentoo.org
Tue Feb 8 01:57:05 GMT 2022
This was needed only to support libtool in case the library ended in
.la instead of .a, but we dropped libtool, so drop this too.
---
newlib/Makefile.in | 1 -
newlib/acinclude.m4 | 1 -
newlib/configure | 2 --
newlib/configure.host | 2 --
newlib/libc/Makefile.am | 24 +++++++++---------
newlib/libc/Makefile.in | 25 +++++++++----------
newlib/libc/argz/Makefile.in | 1 -
newlib/libc/configure | 20 +++++++--------
newlib/libc/configure.ac | 18 ++++++-------
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/a29k/Makefile.in | 1 -
newlib/libc/machine/aarch64/Makefile.in | 1 -
newlib/libc/machine/amdgcn/Makefile.in | 1 -
newlib/libc/machine/arc/Makefile.in | 1 -
newlib/libc/machine/arm/Makefile.in | 1 -
newlib/libc/machine/bfin/Makefile.in | 1 -
newlib/libc/machine/cr16/Makefile.in | 1 -
newlib/libc/machine/cris/Makefile.in | 1 -
newlib/libc/machine/crx/Makefile.in | 1 -
newlib/libc/machine/csky/Makefile.in | 1 -
newlib/libc/machine/d10v/Makefile.in | 1 -
newlib/libc/machine/d30v/Makefile.in | 1 -
newlib/libc/machine/epiphany/Makefile.in | 1 -
newlib/libc/machine/fr30/Makefile.in | 1 -
newlib/libc/machine/frv/Makefile.in | 1 -
newlib/libc/machine/ft32/Makefile.in | 1 -
newlib/libc/machine/h8300/Makefile.in | 1 -
newlib/libc/machine/h8500/Makefile.in | 1 -
newlib/libc/machine/hppa/Makefile.in | 1 -
newlib/libc/machine/i386/Makefile.in | 1 -
newlib/libc/machine/i960/Makefile.in | 1 -
newlib/libc/machine/iq2000/Makefile.in | 1 -
newlib/libc/machine/lm32/Makefile.in | 1 -
newlib/libc/machine/m32c/Makefile.in | 1 -
newlib/libc/machine/m32r/Makefile.in | 1 -
newlib/libc/machine/m68hc11/Makefile.in | 1 -
newlib/libc/machine/m68k/Makefile.in | 1 -
newlib/libc/machine/m88k/Makefile.in | 1 -
newlib/libc/machine/mep/Makefile.in | 1 -
newlib/libc/machine/microblaze/Makefile.in | 1 -
newlib/libc/machine/mips/Makefile.in | 1 -
newlib/libc/machine/mn10200/Makefile.in | 1 -
newlib/libc/machine/mn10300/Makefile.in | 1 -
newlib/libc/machine/moxie/Makefile.in | 1 -
newlib/libc/machine/msp430/Makefile.in | 1 -
newlib/libc/machine/mt/Makefile.in | 1 -
newlib/libc/machine/nds32/Makefile.in | 1 -
newlib/libc/machine/necv70/Makefile.in | 1 -
newlib/libc/machine/nios2/Makefile.in | 1 -
newlib/libc/machine/nvptx/Makefile.in | 1 -
newlib/libc/machine/or1k/Makefile.in | 1 -
newlib/libc/machine/powerpc/Makefile.in | 1 -
newlib/libc/machine/pru/Makefile.in | 1 -
newlib/libc/machine/riscv/Makefile.in | 1 -
newlib/libc/machine/rl78/Makefile.in | 1 -
newlib/libc/machine/rx/Makefile.in | 1 -
newlib/libc/machine/sh/Makefile.in | 1 -
newlib/libc/machine/sparc/Makefile.in | 1 -
newlib/libc/machine/spu/Makefile.in | 1 -
newlib/libc/machine/tic4x/Makefile.in | 1 -
newlib/libc/machine/tic6x/Makefile.in | 1 -
newlib/libc/machine/tic80/Makefile.in | 1 -
newlib/libc/machine/v850/Makefile.in | 1 -
newlib/libc/machine/visium/Makefile.in | 1 -
newlib/libc/machine/w65/Makefile.in | 1 -
newlib/libc/machine/x86_64/Makefile.in | 1 -
newlib/libc/machine/xc16x/Makefile.in | 1 -
newlib/libc/machine/xstormy16/Makefile.in | 1 -
newlib/libc/machine/z8k/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/a29khif/Makefile.in | 1 -
newlib/libc/sys/amdgcn/Makefile.in | 1 -
newlib/libc/sys/arm/Makefile.in | 1 -
newlib/libc/sys/d10v/Makefile.in | 1 -
newlib/libc/sys/decstation/Makefile.in | 1 -
newlib/libc/sys/epiphany/Makefile.in | 1 -
newlib/libc/sys/h8300hms/Makefile.in | 1 -
newlib/libc/sys/h8500hms/Makefile.in | 1 -
newlib/libc/sys/m88kbug/Makefile.in | 1 -
newlib/libc/sys/mmixware/Makefile.in | 1 -
newlib/libc/sys/netware/Makefile.in | 1 -
newlib/libc/sys/or1k/Makefile.in | 1 -
newlib/libc/sys/phoenix/Makefile.in | 1 -
newlib/libc/sys/phoenix/configure | 4 +--
newlib/libc/sys/phoenix/configure.ac | 2 +-
newlib/libc/sys/phoenix/machine/Makefile.in | 1 -
.../libc/sys/phoenix/machine/arm/Makefile.in | 1 -
newlib/libc/sys/phoenix/machine/arm/configure | 2 --
newlib/libc/sys/phoenix/machine/configure | 2 --
newlib/libc/sys/rdos/Makefile.in | 1 -
newlib/libc/sys/rtems/Makefile.in | 1 -
newlib/libc/sys/sh/Makefile.in | 1 -
newlib/libc/sys/sparc64/Makefile.in | 1 -
newlib/libc/sys/sun4/Makefile.in | 1 -
newlib/libc/sys/sysmec/Makefile.in | 1 -
newlib/libc/sys/sysnec810/Makefile.in | 1 -
newlib/libc/sys/sysnecv850/Makefile.in | 1 -
newlib/libc/sys/sysvi386/Makefile.in | 1 -
newlib/libc/sys/sysvnecv70/Makefile.in | 1 -
newlib/libc/sys/tic80/Makefile.in | 1 -
newlib/libc/sys/tirtos/Makefile.in | 1 -
newlib/libc/sys/w65/Makefile.in | 1 -
newlib/libc/sys/z8ksim/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 -
newlib/libm/Makefile.am | 2 +-
newlib/libm/Makefile.in | 3 +--
newlib/libm/common/Makefile.in | 1 -
newlib/libm/complex/Makefile.in | 1 -
newlib/libm/configure | 4 +--
newlib/libm/configure.ac | 2 +-
newlib/libm/fenv/Makefile.in | 1 -
newlib/libm/machine/aarch64/Makefile.in | 1 -
newlib/libm/machine/arm/Makefile.in | 1 -
newlib/libm/machine/i386/Makefile.in | 1 -
newlib/libm/machine/mips/Makefile.in | 1 -
newlib/libm/machine/nds32/Makefile.in | 1 -
newlib/libm/machine/powerpc/Makefile.in | 1 -
newlib/libm/machine/pru/Makefile.in | 1 -
newlib/libm/machine/riscv/Makefile.in | 1 -
newlib/libm/machine/sparc/Makefile.in | 1 -
newlib/libm/machine/spu/Makefile.in | 1 -
newlib/libm/machine/x86_64/Makefile.in | 1 -
newlib/libm/math/Makefile.in | 1 -
newlib/libm/mathfp/Makefile.in | 1 -
143 files changed, 48 insertions(+), 193 deletions(-)
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 8ce3ee87e912..d484e447ac82 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -234,7 +234,6 @@ OBJEXT=${oext}
AC_SUBST(OBJEXT)
AC_SUBST(oext)
-AC_SUBST(aext)
AC_SUBST(lpfx)
AC_SUBST(libm_machine_dir)
diff --git a/newlib/configure.host b/newlib/configure.host
index 1507e25d8d74..22023f9aefd2 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -43,7 +43,6 @@
# stdio64_dir "stdio64" to build libc/stdio64, "" otherwise
# syscall_dir "syscalls" to build libc/syscalls, "" otherwise
# unix_dir "unix" to build libc/unix, "" otherwise
-# aext library extension - needed for libtool support
# oext object file extension - needed for libtool support
# lpfx library object prefix - generated when no libtool
# crt1 name of crt1 object if one is provided
@@ -78,7 +77,6 @@ default_newlib_io_pos_args=no
default_newlib_atexit_dynamic_alloc=yes
default_newlib_nano_malloc=no
default_newlib_reent_check_verify=yes
-aext=a
oext=o
lpfx="lib_a-"
newlib_msg_warn=
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index 005e41bc9f00..4534ea4ee0d0 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -26,7 +26,7 @@ endif
if ENABLE_NEWLIB_ICONV
NEWLIB_ICONV_DIRS = iconv
-NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
+NEWLIB_ICONV_LIBS = iconv/ces/lib.a iconv/ccs/lib.a iconv/lib/lib.a
else
NEWLIB_ICONV_DIRS =
NEWLIB_ICONV_LIBS =
@@ -55,21 +55,21 @@ noinst_DATA = $(CRT0)
noinst_LIBRARIES = libc.a
SUBLIBS = \
- argz/lib.$(aext) \
- stdlib/lib.$(aext) \
- ctype/lib.$(aext) \
- search/lib.$(aext) \
+ argz/lib.a \
+ stdlib/lib.a \
+ ctype/lib.a \
+ search/lib.a \
$(LIBC_STDIO_LIB) \
$(LIBC_STDIO64_LIB) \
$(LIBC_XDR_LIB) \
- string/lib.$(aext) \
+ string/lib.a \
$(LIBC_SIGNAL_LIB) \
- time/lib.$(aext) \
- locale/lib.$(aext) \
- reent/lib.$(aext) \
- errno/lib.$(aext) \
- misc/lib.$(aext) \
- ssp/lib.$(aext) \
+ time/lib.a \
+ locale/lib.a \
+ reent/lib.a \
+ errno/lib.a \
+ misc/lib.a \
+ ssp/lib.a \
$(LIBC_UNIX_LIB) \
$(LIBC_POSIX_LIB) \
$(LIBC_SYSCALL_LIB) \
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 06a58d3e1fff..bef2e8d21508 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -63,49 +63,49 @@ dnl build the library.
LIBC_SIGNAL_LIB=
if test -n "${signal_dir}"; then
- LIBC_SIGNAL_LIB=${signal_dir}/lib.${aext}
+ LIBC_SIGNAL_LIB=${signal_dir}/lib.a
fi
AC_SUBST(LIBC_SIGNAL_LIB)
AM_CONDITIONAL(HAVE_SIGNAL_DIR, test x${signal_dir} != x)
LIBC_STDIO_LIB=
if test -n "${stdio_dir}"; then
- LIBC_STDIO_LIB=${stdio_dir}/lib.${aext}
+ LIBC_STDIO_LIB=${stdio_dir}/lib.a
fi
AC_SUBST(LIBC_STDIO_LIB)
AM_CONDITIONAL(HAVE_STDIO_DIR, test x${stdio_dir} != x)
LIBC_STDIO64_LIB=
if test -n "${stdio64_dir}"; then
- LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext}
+ LIBC_STDIO64_LIB=${stdio64_dir}/lib.a
fi
AC_SUBST(LIBC_STDIO64_LIB)
AM_CONDITIONAL(HAVE_STDIO64_DIR, test x${stdio64_dir} != x)
LIBC_POSIX_LIB=
if test -n "${posix_dir}"; then
- LIBC_POSIX_LIB=${posix_dir}/lib.${aext}
+ LIBC_POSIX_LIB=${posix_dir}/lib.a
fi
AC_SUBST(LIBC_POSIX_LIB)
AM_CONDITIONAL(HAVE_POSIX_DIR, test x${posix_dir} != x)
LIBC_XDR_LIB=
if test -n "${xdr_dir}"; then
- LIBC_XDR_LIB=${xdr_dir}/lib.${aext}
+ LIBC_XDR_LIB=${xdr_dir}/lib.a
fi
AC_SUBST(LIBC_XDR_LIB)
AM_CONDITIONAL(HAVE_XDR_DIR, test x${xdr_dir} != x)
LIBC_SYSCALL_LIB=
if test -n "${syscall_dir}"; then
- LIBC_SYSCALL_LIB=${syscall_dir}/lib.${aext}
+ LIBC_SYSCALL_LIB=${syscall_dir}/lib.a
fi
AC_SUBST(LIBC_SYSCALL_LIB)
AM_CONDITIONAL(HAVE_SYSCALL_DIR, test x${syscall_dir} != x)
LIBC_UNIX_LIB=
if test -n "${unix_dir}"; then
- LIBC_UNIX_LIB=${unix_dir}/lib.${aext}
+ LIBC_UNIX_LIB=${unix_dir}/lib.a
fi
AC_SUBST(LIBC_UNIX_LIB)
AM_CONDITIONAL(HAVE_UNIX_DIR, test x${unix_dir} != x)
@@ -148,7 +148,7 @@ if test -n "${sys_dir}"; then
esac
SYS_DIR=sys/${sys_dir}
- LIBC_SYS_LIB=${SYS_DIR}/lib.${aext}
+ LIBC_SYS_LIB=${SYS_DIR}/lib.a
fi
AC_SUBST(SYS_DIR)
AM_CONDITIONAL(HAVE_SYS_DIR, test x${sys_dir} != x)
@@ -234,7 +234,7 @@ if test -n "${machine_dir}"; then
esac
LIBC_MACHINE_DIR=machine/${machine_dir}
- LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib.${aext}
+ LIBC_MACHINE_LIB=${LIBC_MACHINE_DIR}/lib.a
fi
AM_CONDITIONAL(HAVE_LIBC_MACHINE_DIR, test "x${LIBC_MACHINE_DIR}" != x)
AC_SUBST(LIBC_MACHINE_DIR)
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 0b1fc64d2c3a..55793f7a98c0 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,7 +11,7 @@ NEWLIB_CONFIGURE(../../..)
AC_CONFIG_SUBDIRS(machine)
-PHOENIX_MACH_LIB=machine/lib.${aext}
+PHOENIX_MACH_LIB=machine/lib.a
AC_SUBST(PHOENIX_MACH_LIB)
AC_CONFIG_FILES([Makefile])
diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 0399bcdbed5e..459122158afa 100644
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -11,7 +11,7 @@ if HAVE_LIBM_MACHINE_DIR
SUBDIRS += $(LIBM_MACHINE_DIR)
endif
-SUBLIBS = $(MATHDIR)/lib.$(aext) common/lib.$(aext) complex/lib.$(aext) fenv/lib.$(aext) $(LIBM_MACHINE_LIB)
+SUBLIBS = $(MATHDIR)/lib.a common/lib.a complex/lib.a fenv/lib.a $(LIBM_MACHINE_LIB)
noinst_LIBRARIES = libm.a
libm.a: $(SUBLIBS)
rm -f $@
diff --git a/newlib/libm/configure.ac b/newlib/libm/configure.ac
index 7b4add03f3af..83d33d230dc4 100644
--- a/newlib/libm/configure.ac
+++ b/newlib/libm/configure.ac
@@ -45,7 +45,7 @@ if test -n "${libm_machine_dir}"; then
esac
LIBM_MACHINE_DIR=machine/${libm_machine_dir
- LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
+ LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
fi
AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
AC_SUBST(LIBM_MACHINE_DIR)
--
2.34.1
More information about the Newlib
mailing list