sim: bfin: merge with common configure script

Now that the model logic has been migrated into the runtime, there's
nothing specific in the bfin configure code, so merge it into the
common one.

sim/ChangeLog

@@ -1,3 +1,8 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Remove [true] from bfin SIM_TARGET call.
+	* configure, Makefile.in: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (sim_default_model): Delete.

sim/Makefile.in

@@ -228,12 +228,12 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = Make-common.sim aarch64/Makefile.sim \
-	arm/Makefile.sim avr/Makefile.sim cr16/Makefile.sim \
+	arm/Makefile.sim avr/Makefile.sim bfin/Makefile.sim \
-	d10v/Makefile.sim ft32/Makefile.sim h8300/Makefile.sim \
+	cr16/Makefile.sim d10v/Makefile.sim ft32/Makefile.sim \
-	m32c/Makefile.sim m68hc11/Makefile.sim mcore/Makefile.sim \
+	h8300/Makefile.sim m32c/Makefile.sim m68hc11/Makefile.sim \
-	microblaze/Makefile.sim moxie/Makefile.sim msp430/Makefile.sim \
+	mcore/Makefile.sim microblaze/Makefile.sim moxie/Makefile.sim \
-	pru/Makefile.sim rl78/Makefile.sim rx/Makefile.sim \
+	msp430/Makefile.sim pru/Makefile.sim rl78/Makefile.sim \
-	sh/Makefile.sim erc32/Makefile.sim \
+	rx/Makefile.sim sh/Makefile.sim erc32/Makefile.sim \
 	example-synacor/Makefile.sim arch-subdir.mk
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
@@ -952,6 +952,8 @@ arm/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/arm/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 avr/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/avr/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+bfin/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/bfin/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 cr16/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/cr16/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 d10v/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/d10v/Makefile.in

sim/bfin/ChangeLog

@@ -1,3 +1,9 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Removed.
+	* aclocal.m4: Removed.
+	* configure: Removed.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

sim/bfin/aclocal.m4

@@ -1,15 +0,0 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../m4/sim_ac_output.m4])

sim/bfin/configure.ac

@@ -1,5 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
-
-SIM_AC_OUTPUT

sim/configure

@@ -861,8 +861,7 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 SDL_CFLAGS
 SDL_LIBS'
-ac_subdirs_all='bfin
+ac_subdirs_all='bpf
-bpf
 cris
 frv
 iq2000
@@ -12179,7 +12178,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12182 "configure"
+#line 12181 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12285,7 +12284,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12288 "configure"
+#line 12287 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13778,10 +13777,11 @@ if test "${enable_sim}" != no; then
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=bfin
       fi
+            ac_config_files="$ac_config_files bfin/Makefile.sim:bfin/Makefile.in"
 
+    ac_config_commands="$ac_config_commands bfin/Makefile"
 
-subdirs="$subdirs bfin"
+    as_fn_append SIM_SUBDIRS " bfin"
-
 
     ac_config_commands="$ac_config_commands depdir-bfin"
 
@@ -13795,7 +13795,9 @@ subdirs="$subdirs bfin"
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=bpf
       fi
-            subdirs="$subdirs bpf"
+
+
+subdirs="$subdirs bpf"
 
 
     ac_config_commands="$ac_config_commands depdir-bpf"
@@ -15744,6 +15746,8 @@ do
     "avr/Makefile.sim") CONFIG_FILES="$CONFIG_FILES avr/Makefile.sim:avr/Makefile.in" ;;
     "avr/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS avr/Makefile" ;;
     "depdir-avr") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-avr" ;;
+    "bfin/Makefile.sim") CONFIG_FILES="$CONFIG_FILES bfin/Makefile.sim:bfin/Makefile.in" ;;
+    "bfin/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS bfin/Makefile" ;;
     "depdir-bfin") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-bfin" ;;
     "depdir-bpf") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-bpf" ;;
     "cr16/Makefile.sim") CONFIG_FILES="$CONFIG_FILES cr16/Makefile.sim:cr16/Makefile.in" ;;
@@ -17173,6 +17177,18 @@ $as_echo X"$file" |
  rm -f avr/Makesim1.tmp avr/Makesim2.tmp
  ;;
     "depdir-avr":C) $SHELL $ac_aux_dir/mkinstalldirs avr/$DEPDIR ;;
+    "bfin/Makefile":C) sed -n \
+	-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
+		/^srcdir = / s:$:/bfin:
+		p
+	}' \
+	<Make-common.sim >bfin/Makesim1.tmp
+ sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >bfin/Makesim2.tmp
+ sed -e '/^## COMMON_PRE_/ r bfin/Makesim1.tmp' \
+	-e '/^## COMMON_POST_/ r bfin/Makesim2.tmp' \
+	<bfin/Makefile.sim >bfin/Makefile
+ rm -f bfin/Makesim1.tmp bfin/Makesim2.tmp
+ ;;
     "depdir-bfin":C) $SHELL $ac_aux_dir/mkinstalldirs bfin/$DEPDIR ;;
     "depdir-bpf":C) $SHELL $ac_aux_dir/mkinstalldirs bpf/$DEPDIR ;;
     "cr16/Makefile":C) sed -n \

sim/configure.ac

@@ -114,7 +114,7 @@ if test "${enable_sim}" != no; then
     SIM_TARGET([aarch64*-*-*], [aarch64])
     SIM_TARGET([arm*-*-*], [arm])
     SIM_TARGET([avr*-*-*], [avr])
-    SIM_TARGET([bfin-*-*], [bfin], [true])
+    SIM_TARGET([bfin-*-*], [bfin])
     SIM_TARGET([bpf-*-*], [bpf], [true])
     SIM_TARGET([cr16*-*-*], [cr16])
     SIM_TARGET([cris-*-* | crisv32-*-*], [cris], [true])