[PATCH 2/3] libgloss: merge subdirs that have unique makefile_frags up a level

Merge the subdir configure scripts up that only existed to set unique
values for their target/host makefile_frags.
---
 libgloss/configure           |   26 +-
 libgloss/configure.ac        |   18 +-
 libgloss/rs6000/aclocal.m4   |  383 ----
 libgloss/rs6000/configure    | 3870 ---------------------------------
 libgloss/rs6000/configure.ac |   40 -
 libgloss/spu/aclocal.m4      |  383 ----
 libgloss/spu/configure       | 3870 ---------------------------------
 libgloss/spu/configure.ac    |   40 -
 libgloss/xc16x/aclocal.m4    |  383 ----
 libgloss/xc16x/configure     | 3887 ----------------------------------
 libgloss/xc16x/configure.ac  |   66 -
 11 files changed, 28 insertions(+), 12938 deletions(-)
 delete mode 100644 libgloss/rs6000/aclocal.m4
 delete mode 100755 libgloss/rs6000/configure
 delete mode 100644 libgloss/rs6000/configure.ac
 delete mode 100644 libgloss/spu/aclocal.m4
 delete mode 100755 libgloss/spu/configure
 delete mode 100644 libgloss/spu/configure.ac
 delete mode 100644 libgloss/xc16x/aclocal.m4
 delete mode 100755 libgloss/xc16x/configure
 delete mode 100644 libgloss/xc16x/configure.ac

diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 21ba8f10691f..d635f6af9df3 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -23,6 +23,9 @@ config_testsuite=true
 dnl indicates whether to run configure within the libnosys subdirectory
 config_libnosys=true
 
+host_makefile_frag=${srcdir}/config/default.mh
+target_makefile_frag=${srcdir}/config/default.mt
+
 case "${target}" in
   aarch64*-*-*)
 	AC_CONFIG_SUBDIRS(aarch64)
@@ -84,7 +87,9 @@ case "${target}" in
 	subdirs="$subdirs riscv"
 	;;
   powerpc-*-*|powerpcle-*-*)
-	AC_CONFIG_SUBDIRS([rs6000])
+	AC_CONFIG_FILES([rs6000/Makefile])
+	subdirs="$subdirs rs6000"
+	host_makefile_frag=${srcdir}/config/ppc.mh
 	;;
   mn10200-*-*)
 	AC_CONFIG_SUBDIRS([mn10200])
@@ -156,7 +161,9 @@ case "${target}" in
 	config_testsuite=false
 	;;
   xc16x-*-*)
-	AC_CONFIG_SUBDIRS([xc16x])
+	AC_CONFIG_FILES([xc16x/Makefile])
+	subdirs="$subdirs xc16x"
+	target_makefile_frag=${srcdir}/config/xc16x.mt
 	;;
   xstormy16-*-*)
 	AC_CONFIG_FILES([xstormy16/Makefile])
@@ -183,7 +190,9 @@ case "${target}" in
 	AC_CONFIG_SUBDIRS([arm])
 	;;
   spu-*-elf)
-	AC_CONFIG_SUBDIRS([spu])
+	AC_CONFIG_FILES([spu/Makefile])
+	subdirs="$subdirs spu"
+	host_makefile_frag=${srcdir}/config/ppc.mh
 	config_testsuite=false
 	config_libnosys=false
 	;;
@@ -308,9 +317,6 @@ AC_DEFINE_UNQUOTED(__SYMBOL_PREFIX, "$libc_cv_symbol_prefix", [symbol prefix])
 
 m4_include([libnosys/acinclude.m4])
 
-host_makefile_frag=${srcdir}/config/default.mh
-target_makefile_frag=${srcdir}/config/default.mt
-
 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.
diff --git a/libgloss/rs6000/configure.ac b/libgloss/rs6000/configure.ac
deleted file mode 100644
index 0919404d5db9..000000000000
--- a/libgloss/rs6000/configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(sim-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
-
-host_makefile_frag=${srcdir}/../config/ppc.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)
-
-AC_CONFIG_FILES(Makefile,
-. ${srcdir}/../../config-ml.in,
-srcdir=${srcdir}
-target=${target}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-)
-AC_OUTPUT
diff --git a/libgloss/spu/configure.ac b/libgloss/spu/configure.ac
deleted file mode 100644
index cf5f00bcc86c..000000000000
--- a/libgloss/spu/configure.ac
+++ /dev/null
@@ -1,40 +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
-
-host_makefile_frag=${srcdir}/../config/ppc.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)
-
-AC_CONFIG_FILES(Makefile,
-. ${srcdir}/../../config-ml.in,
-srcdir=${srcdir}
-target=${target}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-)
-AC_OUTPUT
diff --git a/libgloss/xc16x/configure.ac b/libgloss/xc16x/configure.ac
deleted file mode 100644
index 177b7b8282bf..000000000000
--- a/libgloss/xc16x/configure.ac
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2006 KPIT Cummins
-# Copyright (C) 2009 Conny Marco Menebröcker
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms is permitted
-# provided that the above copyright notice and following paragraph are
-# duplicated in all such forms.
-#
-# This file is distributed WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-#
-# 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
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-target_makefile_frag=${srcdir}/../config/xc16x.mt
-
-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)
-target_makefile_frag_path=$target_makefile_frag
-AC_SUBST(target_makefile_frag_path)
-AC_SUBST_FILE(target_makefile_frag)
-AC_SUBST(part_specific_obj)
-AC_SUBST(script_list)
-AC_SUBST(bsp_list)
-
-AC_CONFIG_FILES([Makefile],
-[if test -n "$CONFIG_FILES"; then
-  unset ac_file
-  . ${srcdir}/../../config-ml.in
-fi],
-srcdir=${srcdir}
-target=${target}
-with_multisubdir=${with_multisubdir}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-)
-AC_OUTPUT
-
-
-- 
2.34.1