* [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
@ 2022-02-10 8:51 ` Mike Frysinger
2022-02-10 8:51 ` [PATCH 2/5] newlib: phoenix: drop missing machine subdirs Mike Frysinger
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2022-02-10 8:51 UTC (permalink / raw)
To: newlib
These configure scripts hardcode some settings, so move them to the
Makefile to simplify so we can drop the configure scripts entirely.
---
newlib/libc/sys/phoenix/Makefile.am | 2 ++
newlib/libc/sys/phoenix/Makefile.in | 2 +-
newlib/libc/sys/phoenix/configure | 4 ----
newlib/libc/sys/phoenix/configure.ac | 3 ---
newlib/libc/sys/phoenix/machine/Makefile.am | 2 ++
newlib/libc/sys/phoenix/machine/Makefile.in | 2 +-
newlib/libc/sys/phoenix/machine/configure | 7 -------
newlib/libc/sys/phoenix/machine/configure.ac | 6 ------
8 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index 49647c207544..d6c32e734e5b 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLA
SUBDIRS = machine
+PHOENIX_MACH_LIB = machine/lib.a
+
SUBLIBS = \
$(PHOENIX_MACH_LIB)
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 55793f7a98c0..9d64b9d258a2 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..)
AC_CONFIG_SUBDIRS(machine)
-PHOENIX_MACH_LIB=machine/lib.a
-AC_SUBST(PHOENIX_MACH_LIB)
-
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/phoenix/machine/Makefile.am
index 06c2509a2aab..793d011bef30 100644
--- a/newlib/libc/sys/phoenix/machine/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/Makefile.am
@@ -2,6 +2,8 @@
SUBDIRS = $(machine_dir) .
+CRT0 = crt0.o
+
noinst_DATA = $(CRT0) lib.a
$(CRT0): $(machine_dir)/$(CRT0)
diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac
index f3f7c79bc1f5..05dd0f8e48b6 100644
--- a/newlib/libc/sys/phoenix/machine/configure.ac
+++ b/newlib/libc/sys/phoenix/machine/configure.ac
@@ -18,12 +18,6 @@ if test -n "${machine_dir}"; then
esac;
fi
-CRT0=
-if test -n "${machine_dir}"; then
- CRT0=crt0.o
-fi
-AC_SUBST(CRT0)
-
AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
AC_CONFIG_FILES([Makefile])
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/5] newlib: phoenix: drop missing machine subdirs
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
2022-02-10 8:51 ` [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile Mike Frysinger
@ 2022-02-10 8:51 ` Mike Frysinger
2022-02-10 8:51 ` [PATCH 3/5] newlib: phoenix: merge machine/ trampoline up a level Mike Frysinger
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2022-02-10 8:51 UTC (permalink / raw)
To: newlib
These were never added to the tree, and as we transition from autoconf
to automake, it really wants the latter subdirs to always exist. These
don't, so delete the logic.
---
newlib/libc/sys/phoenix/machine/configure | 11 +----------
newlib/libc/sys/phoenix/machine/configure.ac | 3 ---
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac
index 05dd0f8e48b6..972ffc9c86ec 100644
--- a/newlib/libc/sys/phoenix/machine/configure.ac
+++ b/newlib/libc/sys/phoenix/machine/configure.ac
@@ -12,9 +12,6 @@ NEWLIB_CONFIGURE(../../../..)
if test -n "${machine_dir}"; then
case ${machine_dir} in
arm) AC_CONFIG_SUBDIRS(arm) ;;
- esirisc) AC_CONFIG_SUBDIRS(esirisc) ;;
- i386) AC_CONFIG_SUBDIRS(i386) ;;
- powerpc) AC_CONFIG_SUBDIRS(powerpc) ;;
esac;
fi
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 3/5] newlib: phoenix: merge machine/ trampoline up a level
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
2022-02-10 8:51 ` [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile Mike Frysinger
2022-02-10 8:51 ` [PATCH 2/5] newlib: phoenix: drop missing machine subdirs Mike Frysinger
@ 2022-02-10 8:51 ` Mike Frysinger
2022-02-10 8:51 ` [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts " Mike Frysinger
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2022-02-10 8:51 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 phoenix/ dir itself, so by moving the recursive configure and
make calls into it, we can cut off this logic entirely and save the
overhead.
---
newlib/libc/sys/phoenix/Makefile.am | 10 +-
newlib/libc/sys/phoenix/Makefile.in | 11 +-
newlib/libc/sys/phoenix/configure | 26 +-
newlib/libc/sys/phoenix/configure.ac | 10 +-
newlib/libc/sys/phoenix/machine/Makefile.am | 25 -
newlib/libc/sys/phoenix/machine/Makefile.in | 556 --
newlib/libc/sys/phoenix/machine/aclocal.m4 | 937 ---
newlib/libc/sys/phoenix/machine/configure | 5649 ------------------
newlib/libc/sys/phoenix/machine/configure.ac | 21 -
9 files changed, 44 insertions(+), 7201 deletions(-)
delete mode 100644 newlib/libc/sys/phoenix/machine/Makefile.am
delete mode 100644 newlib/libc/sys/phoenix/machine/Makefile.in
delete mode 100644 newlib/libc/sys/phoenix/machine/aclocal.m4
delete mode 100644 newlib/libc/sys/phoenix/machine/configure
delete mode 100644 newlib/libc/sys/phoenix/machine/configure.ac
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index d6c32e734e5b..d97ef77550c7 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -2,9 +2,9 @@
AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
-SUBDIRS = machine
+SUBDIRS = $(PHOENIX_MACHINE_DIR)
-PHOENIX_MACH_LIB = machine/lib.a
+PHOENIX_MACH_LIB = $(PHOENIX_MACHINE_DIR)/lib.a
SUBLIBS = \
$(PHOENIX_MACH_LIB)
@@ -106,11 +106,11 @@ lib.a: $(lib_a_OBJECTS)
all-local: crt0.o
-crt0.o: machine/crt0.o
+crt0.o: $(PHOENIX_MACHINE_DIR)/crt0.o
rm -f $@
- ln machine/crt0.o $@ >/dev/null 2>/dev/null || cp machine/crt0.o $@
+ ln $(PHOENIX_MACHINE_DIR)/crt0.o $@ >/dev/null 2>/dev/null || cp $(PHOENIX_MACHINE_DIR)/crt0.o $@
-machine/crt0.o: ; @true
+$(PHOENIX_MACHINE_DIR)/crt0.o: ; @true
AM_CFLAGS = -I $(srcdir)/../../stdio
ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 9d64b9d258a2..95b8c26516cf 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -9,7 +9,15 @@ AC_CONFIG_AUX_DIR(../../../..)
NEWLIB_CONFIGURE(../../..)
-AC_CONFIG_SUBDIRS(machine)
+if test -n "${machine_dir}"; then
+ case ${machine_dir} in
+ arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
+ esac
+fi
+PHOENIX_MACHINE_DIR=machine/${machine_dir}
+AC_SUBST(PHOENIX_MACHINE_DIR)
+
+AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/phoenix/machine/Makefile.am
deleted file mode 100644
index 793d011bef30..000000000000
--- a/newlib/libc/sys/phoenix/machine/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-SUBDIRS = $(machine_dir) .
-
-CRT0 = crt0.o
-
-noinst_DATA = $(CRT0) lib.a
-
-$(CRT0): $(machine_dir)/$(CRT0)
- rm -f $@
- ln $(machine_dir)/$(CRT0) $@ >/dev/null 2>/dev/null \
- || cp $(machine_dir)/$(CRT0) $@
-
-$(machine_dir)/$(CRT0): ; @true
-
-CLEANFILES = $(CRT0)
-
-lib.a: $(machine_dir)/lib.a
- rm -f $@
- ln $< $@ >/dev/null 2>/dev/null || cp $< $@
-
-doc:
-
-ACLOCAL_AMFLAGS = -I ../../../.. -I ../../../../.. -I ../../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac
deleted file mode 100644
index 972ffc9c86ec..000000000000
--- a/newlib/libc/sys/phoenix/machine/configure.ac
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl This is the newlib/libc/sys configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([arm])
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(../../../../..)
-
-NEWLIB_CONFIGURE(../../../..)
-
-if test -n "${machine_dir}"; then
- case ${machine_dir} in
- arm) AC_CONFIG_SUBDIRS(arm) ;;
- esac;
-fi
-
-AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts up a level
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
` (2 preceding siblings ...)
2022-02-10 8:51 ` [PATCH 3/5] newlib: phoenix: merge machine/ trampoline up a level Mike Frysinger
@ 2022-02-10 8:51 ` Mike Frysinger
2022-02-10 8:51 ` [PATCH 5/5] newlib: phoenix: merge configure up to top-level Mike Frysinger
2022-02-15 13:38 ` [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Corinna Vinschen
5 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2022-02-10 8:51 UTC (permalink / raw)
To: newlib
The machine configure scripts are all effectively stub scripts that
pass the higher level options to its own makefile.
---
newlib/libc/sys/phoenix/Makefile.in | 1 -
newlib/libc/sys/phoenix/configure | 154 +-
newlib/libc/sys/phoenix/configure.ac | 2 +-
.../libc/sys/phoenix/machine/arm/Makefile.am | 10 -
.../libc/sys/phoenix/machine/arm/Makefile.in | 90 +-
.../libc/sys/phoenix/machine/arm/aclocal.m4 | 937 ---
newlib/libc/sys/phoenix/machine/arm/configure | 5478 -----------------
.../libc/sys/phoenix/machine/arm/configure.ac | 13 -
8 files changed, 34 insertions(+), 6651 deletions(-)
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/aclocal.m4
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/configure
delete mode 100644 newlib/libc/sys/phoenix/machine/arm/configure.ac
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 95b8c26516cf..f7aafc00ab8c 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,7 +11,7 @@ NEWLIB_CONFIGURE(../../..)
if test -n "${machine_dir}"; then
case ${machine_dir} in
- arm) AC_CONFIG_SUBDIRS(machine/arm) ;;
+ arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
esac
fi
PHOENIX_MACHINE_DIR=machine/${machine_dir}
diff --git a/newlib/libc/sys/phoenix/machine/arm/Makefile.am b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
index fd44bd23bac2..28ee11508789 100644
--- a/newlib/libc/sys/phoenix/machine/arm/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/arm/Makefile.am
@@ -1,18 +1,8 @@
## Process this file with automake to generate Makefile.in
-AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
LIB_SOURCES = syscall.S
-AM_CFLAGS = -I$(srcdir)/../..
-AM_CCASFLAGS = -I$(srcdir)/../.. $(AM_CPPFLAGS)
-
noinst_LIBRARIES = lib.a
lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_CFLAGS = $(AM_CFLAGS)
-noinst_DATA =
all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../../../.. -I ../../../../../.. -I ../../../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/phoenix/machine/arm/configure.ac b/newlib/libc/sys/phoenix/machine/arm/configure.ac
deleted file mode 100644
index ab1e0c99c04c..000000000000
--- a/newlib/libc/sys/phoenix/machine/arm/configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-dnl This is the newlib/libc/sys/phoenix/machine/arm configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([crt0.S])
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(../../../../../..)
-
-NEWLIB_CONFIGURE(../../../../..)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 5/5] newlib: phoenix: merge configure up to top-level
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
` (3 preceding siblings ...)
2022-02-10 8:51 ` [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts " Mike Frysinger
@ 2022-02-10 8:51 ` Mike Frysinger
2022-02-15 13:38 ` [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Corinna Vinschen
5 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2022-02-10 8:51 UTC (permalink / raw)
To: newlib
Merge sys/phoenix/ configure logic into libc/ itself. This kills
off the last lingering script in this tree (other than libc itself).
---
newlib/libc/Makefile.in | 3 +-
newlib/libc/argz/Makefile.in | 3 +-
newlib/libc/configure | 168 +-
newlib/libc/configure.ac | 3 +-
newlib/libc/ctype/Makefile.in | 3 +-
newlib/libc/errno/Makefile.in | 3 +-
newlib/libc/iconv/Makefile.in | 3 +-
newlib/libc/iconv/ccs/Makefile.in | 3 +-
newlib/libc/iconv/ccs/binary/Makefile.in | 3 +-
newlib/libc/iconv/ces/Makefile.in | 3 +-
newlib/libc/iconv/lib/Makefile.in | 3 +-
newlib/libc/locale/Makefile.in | 3 +-
newlib/libc/machine/a29k/Makefile.in | 3 +-
newlib/libc/machine/aarch64/Makefile.in | 3 +-
newlib/libc/machine/amdgcn/Makefile.in | 3 +-
newlib/libc/machine/arc/Makefile.in | 3 +-
newlib/libc/machine/arm/Makefile.in | 3 +-
newlib/libc/machine/bfin/Makefile.in | 3 +-
newlib/libc/machine/cr16/Makefile.in | 3 +-
newlib/libc/machine/cris/Makefile.in | 3 +-
newlib/libc/machine/crx/Makefile.in | 3 +-
newlib/libc/machine/csky/Makefile.in | 3 +-
newlib/libc/machine/d10v/Makefile.in | 3 +-
newlib/libc/machine/d30v/Makefile.in | 3 +-
newlib/libc/machine/epiphany/Makefile.in | 3 +-
newlib/libc/machine/fr30/Makefile.in | 3 +-
newlib/libc/machine/frv/Makefile.in | 3 +-
newlib/libc/machine/ft32/Makefile.in | 3 +-
newlib/libc/machine/h8300/Makefile.in | 3 +-
newlib/libc/machine/h8500/Makefile.in | 3 +-
newlib/libc/machine/hppa/Makefile.in | 3 +-
newlib/libc/machine/i386/Makefile.in | 3 +-
newlib/libc/machine/i960/Makefile.in | 3 +-
newlib/libc/machine/iq2000/Makefile.in | 3 +-
newlib/libc/machine/lm32/Makefile.in | 3 +-
newlib/libc/machine/m32c/Makefile.in | 3 +-
newlib/libc/machine/m32r/Makefile.in | 3 +-
newlib/libc/machine/m68hc11/Makefile.in | 3 +-
newlib/libc/machine/m68k/Makefile.in | 3 +-
newlib/libc/machine/m88k/Makefile.in | 3 +-
newlib/libc/machine/mep/Makefile.in | 3 +-
newlib/libc/machine/microblaze/Makefile.in | 3 +-
newlib/libc/machine/mips/Makefile.in | 3 +-
newlib/libc/machine/mn10200/Makefile.in | 3 +-
newlib/libc/machine/mn10300/Makefile.in | 3 +-
newlib/libc/machine/moxie/Makefile.in | 3 +-
newlib/libc/machine/msp430/Makefile.in | 3 +-
newlib/libc/machine/mt/Makefile.in | 3 +-
newlib/libc/machine/nds32/Makefile.in | 3 +-
newlib/libc/machine/necv70/Makefile.in | 3 +-
newlib/libc/machine/nios2/Makefile.in | 3 +-
newlib/libc/machine/nvptx/Makefile.in | 3 +-
newlib/libc/machine/or1k/Makefile.in | 3 +-
newlib/libc/machine/powerpc/Makefile.in | 3 +-
newlib/libc/machine/pru/Makefile.in | 3 +-
newlib/libc/machine/riscv/Makefile.in | 3 +-
newlib/libc/machine/rl78/Makefile.in | 3 +-
newlib/libc/machine/rx/Makefile.in | 3 +-
newlib/libc/machine/sh/Makefile.in | 3 +-
newlib/libc/machine/sparc/Makefile.in | 3 +-
newlib/libc/machine/spu/Makefile.in | 3 +-
newlib/libc/machine/tic4x/Makefile.in | 3 +-
newlib/libc/machine/tic6x/Makefile.in | 3 +-
newlib/libc/machine/tic80/Makefile.in | 3 +-
newlib/libc/machine/v850/Makefile.in | 3 +-
newlib/libc/machine/visium/Makefile.in | 3 +-
newlib/libc/machine/w65/Makefile.in | 3 +-
newlib/libc/machine/x86_64/Makefile.in | 3 +-
newlib/libc/machine/xc16x/Makefile.in | 3 +-
newlib/libc/machine/xstormy16/Makefile.in | 3 +-
newlib/libc/machine/z8k/Makefile.in | 3 +-
newlib/libc/misc/Makefile.in | 3 +-
newlib/libc/posix/Makefile.in | 3 +-
newlib/libc/reent/Makefile.in | 3 +-
newlib/libc/search/Makefile.in | 3 +-
newlib/libc/signal/Makefile.in | 3 +-
newlib/libc/ssp/Makefile.in | 3 +-
newlib/libc/stdio/Makefile.in | 3 +-
newlib/libc/stdio64/Makefile.in | 3 +-
newlib/libc/stdlib/Makefile.in | 3 +-
newlib/libc/string/Makefile.in | 3 +-
newlib/libc/sys/a29khif/Makefile.in | 3 +-
newlib/libc/sys/amdgcn/Makefile.in | 3 +-
newlib/libc/sys/arm/Makefile.in | 3 +-
newlib/libc/sys/d10v/Makefile.in | 3 +-
newlib/libc/sys/decstation/Makefile.in | 3 +-
newlib/libc/sys/epiphany/Makefile.in | 3 +-
newlib/libc/sys/h8300hms/Makefile.in | 3 +-
newlib/libc/sys/h8500hms/Makefile.in | 3 +-
newlib/libc/sys/m88kbug/Makefile.in | 3 +-
newlib/libc/sys/mmixware/Makefile.in | 3 +-
newlib/libc/sys/netware/Makefile.in | 3 +-
newlib/libc/sys/or1k/Makefile.in | 3 +-
newlib/libc/sys/phoenix/Makefile.am | 2 -
newlib/libc/sys/phoenix/Makefile.in | 97 +-
newlib/libc/sys/phoenix/acinclude.m4 | 10 +
newlib/libc/sys/phoenix/aclocal.m4 | 937 ---
newlib/libc/sys/phoenix/configure | 5504 -----------------
newlib/libc/sys/phoenix/configure.ac | 23 -
.../libc/sys/phoenix/machine/arm/Makefile.in | 32 +-
newlib/libc/sys/rdos/Makefile.in | 3 +-
newlib/libc/sys/rtems/Makefile.in | 3 +-
newlib/libc/sys/sh/Makefile.in | 3 +-
newlib/libc/sys/sparc64/Makefile.in | 3 +-
newlib/libc/sys/sun4/Makefile.in | 3 +-
newlib/libc/sys/sysmec/Makefile.in | 3 +-
newlib/libc/sys/sysnec810/Makefile.in | 3 +-
newlib/libc/sys/sysnecv850/Makefile.in | 3 +-
newlib/libc/sys/sysvi386/Makefile.in | 3 +-
newlib/libc/sys/sysvnecv70/Makefile.in | 3 +-
newlib/libc/sys/tic80/Makefile.in | 3 +-
newlib/libc/sys/tirtos/Makefile.in | 3 +-
newlib/libc/sys/w65/Makefile.in | 3 +-
newlib/libc/sys/z8ksim/Makefile.in | 3 +-
newlib/libc/syscalls/Makefile.in | 3 +-
newlib/libc/time/Makefile.in | 3 +-
newlib/libc/unix/Makefile.in | 3 +-
newlib/libc/xdr/Makefile.in | 3 +-
118 files changed, 319 insertions(+), 6784 deletions(-)
create mode 100644 newlib/libc/sys/phoenix/acinclude.m4
delete mode 100644 newlib/libc/sys/phoenix/aclocal.m4
delete mode 100644 newlib/libc/sys/phoenix/configure
delete mode 100644 newlib/libc/sys/phoenix/configure.ac
diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index d762eb938ebf..a49fcaa45532 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -126,7 +126,7 @@ if test -n "${sys_dir}"; then
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) ;;
+ phoenix) AC_CONFIG_FILES([sys/phoenix/Makefile]) ;;
rdos) AC_CONFIG_FILES([sys/rdos/Makefile]) ;;
rtems) AC_CONFIG_FILES([sys/rtems/Makefile]) ;;
sh) AC_CONFIG_FILES([sys/sh/Makefile]) ;;
@@ -164,6 +164,7 @@ m4_include([machine/nds32/acinclude.m4])
m4_include([machine/powerpc/acinclude.m4])
m4_include([machine/sh/acinclude.m4])
m4_include([machine/spu/acinclude.m4])
+m4_include([sys/phoenix/acinclude.m4])
LIBC_MACHINE_LIB=
if test -n "${machine_dir}"; then
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index d97ef77550c7..ecba00768643 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -113,8 +113,6 @@ crt0.o: $(PHOENIX_MACHINE_DIR)/crt0.o
$(PHOENIX_MACHINE_DIR)/crt0.o: ; @true
AM_CFLAGS = -I $(srcdir)/../../stdio
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
diff --git a/newlib/libc/sys/phoenix/acinclude.m4 b/newlib/libc/sys/phoenix/acinclude.m4
new file mode 100644
index 000000000000..fac0f6f20de2
--- /dev/null
+++ b/newlib/libc/sys/phoenix/acinclude.m4
@@ -0,0 +1,10 @@
+AS_IF([test "$sys_dir" = "phoenix"], [dnl
+ m4_foreach_w([MACHINE], [
+ arm
+ ], [dnl
+ AS_IF(test "${machine_dir}" = MACHINE, AC_CONFIG_FILES([sys/phoenix/machine/]MACHINE[/Makefile]))
+ ])
+
+ PHOENIX_MACHINE_DIR=machine/${machine_dir}
+])
+AC_SUBST(PHOENIX_MACHINE_DIR)
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
deleted file mode 100644
index f7aafc00ab8c..000000000000
--- a/newlib/libc/sys/phoenix/configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl This is the newlib/libc/sys/phoenix configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([phoenix.c])
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-if test -n "${machine_dir}"; then
- case ${machine_dir} in
- arm) AC_CONFIG_FILES([machine/arm/Makefile]) ;;
- esac
-fi
-PHOENIX_MACHINE_DIR=machine/${machine_dir}
-AC_SUBST(PHOENIX_MACHINE_DIR)
-
-AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
` (4 preceding siblings ...)
2022-02-10 8:51 ` [PATCH 5/5] newlib: phoenix: merge configure up to top-level Mike Frysinger
@ 2022-02-15 13:38 ` Corinna Vinschen
5 siblings, 0 replies; 7+ messages in thread
From: Corinna Vinschen @ 2022-02-15 13:38 UTC (permalink / raw)
To: newlib
On Feb 10 03:51, Mike Frysinger wrote:
> With sys/linux/ gone, this is the only tree left with configure scripts
> below libc/, so spend some time cleaning these up specially. This gets
> us down to 2 configure scripts in all of newlib.
>
> Mike Frysinger (5):
> newlib: phoenix: move some logic from configure to the Makefile
> newlib: phoenix: drop missing machine subdirs
> newlib: phoenix: merge machine/ trampoline up a level
> newlib: phoenix: merge machine/ configure scripts up a level
> newlib: phoenix: merge configure up to top-level
Thanks, please push.
Corinna
^ permalink raw reply [flat|nested] 7+ messages in thread