[PATCH 2/2] newlib: stop checking --enable-multilib in subdirs
Mike Frysinger <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <[email protected]> |
None of the subdirs actually use the multilib arg, so include the
logic only in the top-level configure.
---
NB: I can invert the order of these patches easily enough if preferred.
newlib/acinclude.m4 | 11 ---
newlib/configure | 74 +++++++++----------
newlib/configure.ac | 1 +
newlib/iconvdata/configure | 17 +----
newlib/libc/configure | 17 +----
newlib/libc/machine/a29k/configure | 13 ----
newlib/libc/machine/aarch64/configure | 13 ----
newlib/libc/machine/amdgcn/configure | 13 ----
newlib/libc/machine/arc/configure | 13 ----
newlib/libc/machine/arm/configure | 13 ----
newlib/libc/machine/bfin/configure | 13 ----
newlib/libc/machine/configure | 17 +----
newlib/libc/machine/cr16/configure | 13 ----
newlib/libc/machine/cris/configure | 13 ----
newlib/libc/machine/crx/configure | 13 ----
newlib/libc/machine/csky/configure | 13 ----
newlib/libc/machine/d10v/configure | 13 ----
newlib/libc/machine/d30v/configure | 13 ----
newlib/libc/machine/epiphany/configure | 13 ----
newlib/libc/machine/fr30/configure | 13 ----
newlib/libc/machine/frv/configure | 13 ----
newlib/libc/machine/ft32/configure | 13 ----
newlib/libc/machine/h8300/configure | 13 ----
newlib/libc/machine/h8500/configure | 13 ----
newlib/libc/machine/hppa/configure | 13 ----
newlib/libc/machine/i386/configure | 17 +----
newlib/libc/machine/i960/configure | 13 ----
newlib/libc/machine/iq2000/configure | 13 ----
newlib/libc/machine/lm32/configure | 13 ----
newlib/libc/machine/m32c/configure | 13 ----
newlib/libc/machine/m32r/configure | 13 ----
newlib/libc/machine/m68hc11/configure | 13 ----
newlib/libc/machine/m68k/configure | 13 ----
newlib/libc/machine/m88k/configure | 13 ----
newlib/libc/machine/mep/configure | 13 ----
newlib/libc/machine/microblaze/configure | 13 ----
newlib/libc/machine/mips/configure | 13 ----
newlib/libc/machine/mn10200/configure | 13 ----
newlib/libc/machine/mn10300/configure | 13 ----
newlib/libc/machine/moxie/configure | 13 ----
newlib/libc/machine/msp430/configure | 13 ----
newlib/libc/machine/mt/configure | 13 ----
newlib/libc/machine/nds32/configure | 13 ----
newlib/libc/machine/necv70/configure | 13 ----
newlib/libc/machine/nios2/configure | 13 ----
newlib/libc/machine/nvptx/configure | 13 ----
newlib/libc/machine/or1k/configure | 13 ----
newlib/libc/machine/powerpc/configure | 13 ----
newlib/libc/machine/pru/configure | 13 ----
newlib/libc/machine/riscv/configure | 13 ----
newlib/libc/machine/rl78/configure | 13 ----
newlib/libc/machine/rx/configure | 13 ----
newlib/libc/machine/sh/configure | 13 ----
newlib/libc/machine/sparc/configure | 13 ----
newlib/libc/machine/spu/configure | 13 ----
newlib/libc/machine/tic4x/configure | 13 ----
newlib/libc/machine/tic6x/configure | 13 ----
newlib/libc/machine/tic80/configure | 13 ----
newlib/libc/machine/v850/configure | 13 ----
newlib/libc/machine/visium/configure | 13 ----
newlib/libc/machine/w65/configure | 13 ----
newlib/libc/machine/x86_64/configure | 13 ----
newlib/libc/machine/xc16x/configure | 13 ----
newlib/libc/machine/xscale/configure | 13 ----
newlib/libc/machine/xstormy16/configure | 13 ----
newlib/libc/machine/z8k/configure | 13 ----
newlib/libc/sys/a29khif/configure | 13 ----
newlib/libc/sys/amdgcn/configure | 13 ----
newlib/libc/sys/arm/configure | 13 ----
newlib/libc/sys/configure | 17 +----
newlib/libc/sys/d10v/configure | 13 ----
newlib/libc/sys/decstation/configure | 13 ----
newlib/libc/sys/epiphany/configure | 13 ----
newlib/libc/sys/h8300hms/configure | 13 ----
newlib/libc/sys/h8500hms/configure | 13 ----
newlib/libc/sys/linux/configure | 17 +----
newlib/libc/sys/linux/linuxthreads/configure | 17 +----
.../sys/linux/linuxthreads/machine/configure | 17 +----
.../linux/linuxthreads/machine/i386/configure | 17 +----
newlib/libc/sys/linux/machine/configure | 17 +----
newlib/libc/sys/linux/machine/i386/configure | 17 +----
newlib/libc/sys/m88kbug/configure | 13 ----
newlib/libc/sys/mmixware/configure | 13 ----
newlib/libc/sys/netware/configure | 13 ----
newlib/libc/sys/or1k/configure | 13 ----
newlib/libc/sys/phoenix/configure | 13 ----
newlib/libc/sys/phoenix/machine/arm/configure | 13 ----
newlib/libc/sys/phoenix/machine/configure | 13 ----
newlib/libc/sys/rdos/configure | 13 ----
newlib/libc/sys/rtems/configure | 13 ----
newlib/libc/sys/sh/configure | 13 ----
newlib/libc/sys/sparc64/configure | 13 ----
newlib/libc/sys/sun4/configure | 13 ----
newlib/libc/sys/sysmec/configure | 13 ----
newlib/libc/sys/sysnec810/configure | 13 ----
newlib/libc/sys/sysnecv850/configure | 13 ----
newlib/libc/sys/sysvi386/configure | 13 ----
newlib/libc/sys/sysvnecv70/configure | 13 ----
newlib/libc/sys/tic80/configure | 13 ----
newlib/libc/sys/tirtos/configure | 13 ----
newlib/libc/sys/w65/configure | 13 ----
newlib/libc/sys/z8ksim/configure | 13 ----
newlib/libm/configure | 17 +----
newlib/libm/machine/aarch64/configure | 13 ----
newlib/libm/machine/arm/configure | 13 ----
newlib/libm/machine/configure | 17 +----
newlib/libm/machine/i386/configure | 17 +----
newlib/libm/machine/mips/configure | 13 ----
newlib/libm/machine/nds32/configure | 13 ----
newlib/libm/machine/powerpc/configure | 13 ----
newlib/libm/machine/pru/configure | 13 ----
newlib/libm/machine/riscv/configure | 13 ----
newlib/libm/machine/sparc/configure | 13 ----
newlib/libm/machine/spu/configure | 13 ----
newlib/libm/machine/x86_64/configure | 17 +----
115 files changed, 68 insertions(+), 1534 deletions(-)
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 9e25b8589b84..1a5dc60dbbbd 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -13,17 +13,6 @@ dnl newlib directory.
AC_DEFUN([NEWLIB_CONFIGURE],
[AC_REQUIRE([DEF_NEWLIB_VERSION])
-m4_if($1, [.], [AM_ENABLE_MULTILIB(, ..)], [dnl
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[ --enable-multilib build many library versions (default)],
-[case "${enableval}" in
- yes) multilib=yes ;;
- no) multilib=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-])dnl
-
dnl Support --enable-target-optspace
AC_ARG_ENABLE(target-optspace,
[ --enable-target-optspace optimize for space],
diff --git a/newlib/configure.ac b/newlib/configure.ac
index f56832247111..31e4586cd674 100644
--- a/newlib/configure.ac
+++ b/newlib/configure.ac
@@ -285,6 +285,7 @@ AC_ARG_ENABLE(newlib-use-gdtoa,
esac
fi], [newlib_use_gdtoa=yes])dnl
+AM_ENABLE_MULTILIB(, ..)
NEWLIB_CONFIGURE(.)
dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
--
2.34.1