[PATCH 3/8] libgloss: merge moxie configure script up a level

[Mike Frysinger <vapier@gentoo.org>]

Move the minor moxie-specific logic to a dedicated file & namespace them
so we can merge its configure logic up a level.
---
 libgloss/Makefile.in        |   11 +-
 libgloss/configure          |   20 +-
 libgloss/configure.ac       |    4 +-
 libgloss/moxie/Makefile.in  |   17 +-
 libgloss/moxie/acinclude.m4 |   13 +
 libgloss/moxie/aclocal.m4   |  384 ----
 libgloss/moxie/configure    | 3943 -----------------------------------
 libgloss/moxie/configure.ac |   50 -
 8 files changed, 49 insertions(+), 4393 deletions(-)
 create mode 100644 libgloss/moxie/acinclude.m4
 delete mode 100644 libgloss/moxie/aclocal.m4
 delete mode 100755 libgloss/moxie/configure
 delete mode 100644 libgloss/moxie/configure.ac

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 20f15a88b023..6eb39118b509 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -149,7 +149,8 @@ case "${target}" in
 	subdirs="$subdirs mep"
 	;;
   moxie-*-*)
-	AC_CONFIG_SUBDIRS([moxie])
+	AC_CONFIG_FILES([moxie/Makefile])
+	subdirs="$subdirs moxie"
 	;;
   microblaze*-*-*)
 	AC_CONFIG_FILES([microblaze/Makefile])
@@ -324,6 +325,7 @@ AC_DEFINE_UNQUOTED(__SYMBOL_PREFIX, "$libc_cv_symbol_prefix", [symbol prefix])
 
 m4_include([i386/acinclude.m4])
 m4_include([libnosys/acinclude.m4])
+m4_include([moxie/acinclude.m4])
 
 dnl We have to assign the same value to other variables because autoconf
 dnl doesn't provide a mechanism to substitute a replacement keyword with
diff --git a/libgloss/moxie/Makefile.in b/libgloss/moxie/Makefile.in
index bb074ce12941..e87510fe2e8f 100644
--- a/libgloss/moxie/Makefile.in
+++ b/libgloss/moxie/Makefile.in
@@ -62,10 +62,10 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
 
 LD_SCRIPTS = moxie-elf-common.ld qemu.ld sim.ld moxiebox.ld
 
-@BUILD_CRT0_TRUE@CRT0		= crt0.o
-@BUILD_CRT0_TRUE@CRT0_INSTALL	= install-crt0
-@BUILD_CRT0_FALSE@CRT0		= 
-@BUILD_CRT0_FALSE@CRT0_INSTALL	= 
+@MOXIE_BUILD_CRT0_TRUE@CRT0		= crt0.o
+@MOXIE_BUILD_CRT0_TRUE@CRT0_INSTALL	= install-crt0
+@MOXIE_BUILD_CRT0_FALSE@CRT0		=
+@MOXIE_BUILD_CRT0_FALSE@CRT0_INSTALL	=
 
 SIM_BSP = libsim.a
 SIM_OBJS = fstat.o \
@@ -146,15 +146,12 @@ clean mostlyclean:
 	rm -f *.o *.a
 
 distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
+	rm -f Makefile
 
 .PHONY: info dvi doc install-info clean-info
 info doc dvi:
 install-info:
 clean-info:
 
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
+Makefile: Makefile.in ../config.status
+	cd .. && $(SHELL) config.status
diff --git a/libgloss/moxie/acinclude.m4 b/libgloss/moxie/acinclude.m4
new file mode 100644
index 000000000000..77428ee37ded
--- /dev/null
+++ b/libgloss/moxie/acinclude.m4
@@ -0,0 +1,13 @@
+dnl Don't build crt0 for moxiebox, which provides crt0 for us.
+case "${target}" in
+  moxie-*-moxiebox*)
+    MOXIE_BUILD_CRT0_TRUE='#'
+    MOXIE_BUILD_CRT0_FALSE=
+    ;;
+  *)
+    MOXIE_BUILD_CRT0_TRUE=
+    MOXIE_BUILD_CRT0_FALSE='#'
+    ;;
+esac
+AC_SUBST(MOXIE_BUILD_CRT0_TRUE)
+AC_SUBST(MOXIE_BUILD_CRT0_FALSE)
diff --git a/libgloss/moxie/configure.ac b/libgloss/moxie/configure.ac
deleted file mode 100644
index f09d72b77932..000000000000
--- a/libgloss/moxie/configure.ac
+++ /dev/null
@@ -1,50 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(crt0.S)
-
-AC_CONFIG_AUX_DIR(../..)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-LIB_AM_PROG_AS
-
-dnl Don't build crt0 for moxiebox, which provides crt0 for us.
-case "${target}" in
-  moxie-*-moxiebox*)
-    BUILD_CRT0_TRUE='#'
-    BUILD_CRT0_FALSE=
-    ;;
-  *)
-    BUILD_CRT0_TRUE=
-    BUILD_CRT0_FALSE='#'
-    ;;
-esac
-
-AC_SUBST(BUILD_CRT0_TRUE)
-AC_SUBST(BUILD_CRT0_FALSE)
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AM_ENABLE_MULTILIB(, ../..)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
-- 
2.34.1