sim: delete SIM_AC_COMMON macro

Now that we've moved all content out to the common file, this is empty and can be deleted it entirely.
5 years ago · 3eda63f2e4
127 changed files with 160 additions and 188 deletions
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* README-HACKING (SIM_AC_COMMON): Delete mention.
+	* m4/sim_ac_common.m4: Removed.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* arch-subdir.mk.in (MAINT): Define.
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@ -41,20 +41,11 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])

-SIM_AC_COMMON
-
 ... target specific additions ...

 SIM_AC_OUTPUT
 --- snip ---

-SIM_AC_COMMON:
-
- invokes the autoconf macros most often used by the simulators
- defines --enable/--with options usable by all simulators
- initializes sim_link_files/sim_link_links as the set of symbolic links
-  to set up
-
 SIM_AC_OUTPUT:

 - creates the symbolic links defined in sim_link_{files,links}
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/aarch64/configure.ac
+++ b/sim/aarch64/configure.ac
@ -22,6 +22,4 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/arm/configure
+++ b/sim/arm/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/avr/configure
+++ b/sim/avr/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/avr/configure.ac
+++ b/sim/avr/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* Makefile.in: Change @MAINTAINER_MODE_TRUE@ to $(MAINT).
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@ -13,7 +13,6 @@

 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_include([../../config/pkg.m4])
-m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@ -1808,8 +1808,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_default_model="bf537"
 # Check whether --enable-sim-default-model was given.
 if test "${enable_sim_default_model+set}" = set; then :
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_DEFAULT_MODEL(bf537)
 SIM_AC_OPTION_HARDWARE(\
 	bfin_cec \
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@ -1687,8 +1687,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 wire_word_bitsize="64"
 wire_word_msb=""
 wire_address_bitsize=""
--- a/sim/bpf/configure.ac
+++ b/sim/bpf/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_BITSIZE([64])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([bpf-def])
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
--- a/sim/cris/configure
+++ b/sim/cris/configure
@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_scache="16384"
 # Check whether --enable-sim-scache was given.
 if test "${enable_sim_scache+set}" = set; then :
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx)

--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@ -1833,8 +1833,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 # In the Cygwin environment, we need some additional flags.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@ -17,8 +17,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 # In the Cygwin environment, we need some additional flags.
 AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
 [AC_EGREP_CPP(lose, [
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/example-synacor/configure.ac
+++ b/sim/example-synacor/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
--- a/sim/frv/configure
+++ b/sim/frv/configure
@ -1689,8 +1689,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_scache="16384"
 # Check whether --enable-sim-scache was given.
 if test "${enable_sim_scache+set}" = set; then :
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(fr500)

--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/ft32/configure.ac
+++ b/sim/ft32/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/h8300/configure.ac
+++ b/sim/h8300/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_scache="16384"
 # Check whether --enable-sim-scache was given.
 if test "${enable_sim_scache+set}" = set; then :
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(iq2000)

--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_scache="16384"
 # Check whether --enable-sim-scache was given.
 if test "${enable_sim_scache+set}" = set; then :
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(lm32)
 SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart)
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@ -1688,8 +1688,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_scache="16384"
 # Check whether --enable-sim-scache was given.
 if test "${enable_sim_scache+set}" = set; then :
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)

--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@ -1,24 +0,0 @@
-dnl   Copyright (C) 1997-2021 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
-dnl SIM_AC_COMMON invokes AC macros used by all simulators and by the common
-dnl directory.  It is intended to be invoked before any target specific stuff.
-dnl SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
-dnl It is intended to be invoked last.
-dnl
-dnl See README-HACKING for more details.
-AC_DEFUN([SIM_AC_COMMON],
-[dnl
-]) dnl End of SIM_AC_COMMON
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue \
  m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
 sim_hw_cflags="-DWITH_HW=1"
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 dnl Options available in this module
 SIM_AC_OPTION_HARDWARE(\
  m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_float.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
--- a/sim/mips/configure
+++ b/sim/mips/configure
@ -1699,8 +1699,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_reserved_bits="1"
 # Check whether --enable-sim-reserved-bits was given.
 if test "${enable_sim_reserved_bits+set}" = set; then :
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 dnl Options available in this module
 SIM_AC_OPTION_RESERVED_BITS(1)

--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@ -12,7 +12,6 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_reserved_bits.m4])
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 default_sim_reserved_bits="1"
 # Check whether --enable-sim-reserved-bits was given.
 if test "${enable_sim_reserved_bits+set}" = set; then :
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* Makefile.in: Change @MAINTAINER_MODE_TRUE@ to $(MAINT).
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/aclocal.m4
@ -12,6 +12,5 @@
 # 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_common.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_output.m4])
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu



-
-
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
 sim_hw="$hardware"
--- a/sim/msp430/configure.ac
+++ b/sim/msp430/configure.ac
@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])

-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@ -1,3 +1,8 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_COMMON): Delete.
+	* aclocal.m4, configure: Regenerate.
+
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>

 	* aclocal.m4: Regenerate.