[PATCH] sim: testsuite: delete configure script

[Mike Frysinger]

Now that we've moved all ports to dejagnu & testsuite/sim/, the only
thing the testsuite/configure script has been doing is filling in the
sim_arch field in the testsuite/Makefile.  We can simply let the top
sim/configure script do that for us now.  This simplifies & speeds up
the build a bit by killing an entire configure script.
---
 sim/ChangeLog              |    7 +
 sim/configure              |   16 +-
 sim/configure.ac           |   16 +-
 sim/testsuite/ChangeLog    |    5 +
 sim/testsuite/Makefile.in  |    8 +-
 sim/testsuite/configure    | 3095 ------------------------------------
 sim/testsuite/configure.ac |   16 -
 7 files changed, 27 insertions(+), 3136 deletions(-)
 delete mode 100755 sim/testsuite/configure
 delete mode 100644 sim/testsuite/configure.ac

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 047ff6ba0800..f2f77d8d1629 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete AC_CONFIG_SUBDIRS(testsuite) call.
+	Add AC_CONFIG_FILES([Makefile testsuite/Makefile]) call.
+	Drop argument to AC_OUTPUT.
+	* configure: Regenerate.
+
 2020-11-01  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* bpf/configure: Re-generate.
diff --git a/sim/configure b/sim/configure
index 34f1a15a4c63..26cd9a68d3d1 100755
--- a/sim/configure
+++ b/sim/configure
@@ -696,7 +696,6 @@ erc32
 ppc
 ft32
 v850
-testsuite
 igen'
 
 # Initialize some variables set by options.
@@ -3914,17 +3913,13 @@ subdirs="$subdirs aarch64"
 esac
 
 
-   if test x"${sim_arch}" != x; then
-      subdirs="$subdirs testsuite"
+  if test "$sim_igen" = yes; then
+    subdirs="$subdirs igen"
 
-      if test "$sim_igen" = yes; then
-         subdirs="$subdirs igen"
-
-      fi
-   fi
+  fi
 fi
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile testsuite/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4633,6 +4628,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -5232,5 +5228,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
-exit 0
diff --git a/sim/configure.ac b/sim/configure.ac
index d92ca25d3978..7de8b99888bf 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -42,15 +42,11 @@ m4_define([SIM_ARCH], [
   AC_CONFIG_SUBDIRS($1)
 ])
 if test "${enable_sim}" != no; then
-   sinclude(configure.tgt)
-   if test x"${sim_arch}" != x; then
-      AC_CONFIG_SUBDIRS(testsuite)
-      if test "$sim_igen" = yes; then
-         AC_CONFIG_SUBDIRS(igen)
-      fi
-   fi
+  sinclude(configure.tgt)
+  if test "$sim_igen" = yes; then
+    AC_CONFIG_SUBDIRS(igen)
+  fi
 fi
 
-AC_OUTPUT(Makefile)
-
-exit 0
+AC_CONFIG_FILES([Makefile testsuite/Makefile])
+AC_OUTPUT
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 4e27a91c21ee..345147ff5b9f 100644
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-05  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure, configure.ac: Delete.
+	* Makefile.in (Makefile, config.status): Switch to ../config.status.
+
 2021-01-05  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (target): Delete d10v-*-elf case.
diff --git a/sim/testsuite/Makefile.in b/sim/testsuite/Makefile.in
index d1ac988adf88..1f75db6a5539 100644
--- a/sim/testsuite/Makefile.in
+++ b/sim/testsuite/Makefile.in
@@ -171,11 +171,11 @@ distclean maintainer-clean realclean: clean
 	    done ; \
 	else true; fi
 
-Makefile : Makefile.in config.status
-	$(SHELL) config.status
+Makefile : Makefile.in ../config.status
+	$(SHELL) ../config.status
 
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
+config.status: $(srcdir)/../configure
+	$(SHELL) ../config.status --recheck
 # FIXME: Requires --enable-maintainer-mode, which one could add, but
 # it's provided by automake.  Maybe switch to automake someday.
 #$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
deleted file mode 100755
index c90da3e6fff4..000000000000
--- a/sim/testsuite/configure
+++ /dev/null
diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac
deleted file mode 100644
index 140eb7d5a762..000000000000
--- a/sim/testsuite/configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl Process this file file with autoconf to produce a configure script.
-dnl This file is a shell script fragment that supplies the information
-dnl necessary to tailor a template configure script into the configure
-dnl script appropriate for this directory.  For more information, check
-dnl any existing configure script.
-
-AC_INIT(common/bits-tst.c)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(../..)
-AC_CANONICAL_SYSTEM
-
-sinclude(../configure.tgt)
-
-AC_OUTPUT(Makefile)
-- 
2.28.0