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.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 9bbf9e757f69bee8d5fce114f24b503a94784313..5ccfdba42dfb5afc559f1699183fe8681383b82c 100644 (file)
--- 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.

diff --git a/sim/README-HACKING b/sim/README-HACKING
index d4867c9e79e48797d543a132812b480d92b7d2f0..3715467337f724bbd219e1deabcfefff3d61a789 100644 (file)
--- 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}

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 1467a07bbf9aed7e2adeb268c387079babc1c7e4..7ca821934c14f0ffc8f94c7b720e8010ffd786b8 100644 (file)
--- 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.

diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac
index 849e957f827783c9b91d1326195e8a529477cdaf..3d4290ac3f41241dd65699c8c26ac9228ce5355d 100644 (file)
--- 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

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index ad31dd250cee8fbddd6eb735c2c55c0389ff2949..164c785c4372342bf1cd8f5c3642076d55f44b85 100644 (file)
--- 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.

diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/arm/configure b/sim/arm/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 9637f7527d0fc69fadd8065c4bdbf485237350e0..e200f2001dbbdf474ed8834bd64c95bf4be4bd19 100644 (file)
--- 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.

diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/avr/configure b/sim/avr/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 30c2c77d10f4974810dfcb988665d173779ef156..e3e352a84d35ef6c7ae6d740c1d055671f0faaac 100644 (file)
--- 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).

diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index 5d4500855dacb9bae90ae1ac8855ab372493afd9..abca26eeaa0c7c88f06a900645e2383d8b5d3d52 100644 (file)
--- 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])

diff --git a/sim/bfin/configure b/sim/bfin/configure
index 5f64567043913e4a5f80a73f6e41af733dbfcf0f..0453baeab95866b645f4e0b870c3ca3c652a67ce 100755 (executable)
--- 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 :

diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 9b17dc4212fe692b6001c7ff468340c55bd228f0..4e31c6f1359432cc4016c19d1d3a524526f72aa3 100644 (file)
--- 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 \

diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 339857ebc0fddb97cbcbac0698bd0b3813d99d9d..e31f509572d9f008a3f1b0d9d1bfc5b6e35a1ee4 100644 (file)
--- 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.

diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index 4b13aea93bfc05099f4f03310a3bf613c25c2f02..c7a63712ed36100d7e7a240eb565a8a837173b74 100644 (file)
--- 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])

diff --git a/sim/bpf/configure b/sim/bpf/configure
index 2c0d9a8beae476f9bec3a44aefa6141ed5883ffb..e07b470a6c032cacaed90fcc4a77fc32624ef483 100755 (executable)
--- 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=""

diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac
index 13516a0914e72f0241b2134b6fcd7cf4f08e9251..32729370b5aaa692b7678172291c85713b6d7923 100644 (file)
--- 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])

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 54a8ce82d035ee84525e65af8891ea7be2cdc82c..15b31dc481902c0f4b056e95ce02887d135e0044 100644 (file)
--- 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.

diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/cr16/configure b/sim/cr16/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 85745016b5b933a694581cb75bdf489e94052501..ad25fc4dd209acb9b96e3a59eb73b278f57047ee 100644 (file)
--- 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.

diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 79b3a8933a285c0ca7da6f079252b16a82a3d03f..08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb 100644 (file)
--- 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])

diff --git a/sim/cris/configure b/sim/cris/configure
index b17358547848f1337a4cc4cc0dd61f653c684c04..4c45fc6e0447066842fcafc085028a7776bef10d 100755 (executable)
--- 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 :

diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 909c41653f1856c81061cd4386b58f1f06b5ce4e..13500a09a495ba18941ecfba615d1e16ada5dcbd 100644 (file)
--- 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)
 

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 2990f4e6d39632347df76957b1e659a0b45e1a65..e0c518c93c348baf3b60a1e6fae4445e11bdc551 100644 (file)
--- 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.

diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/d10v/configure b/sim/d10v/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 38da15a064cfa488485561686105ad1de05ec526..ef7025f212da7caec9c64afab42017cf84f741ae 100644 (file)
--- 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.

diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/erc32/configure b/sim/erc32/configure
index 4fda8efe4f93a713bc00fcbb27ea267e1071763c..cc8c9bec87d4050f84edc72e00eac16120b5c28b 100755 (executable)
--- 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'

diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 3cb35d80f576203479c3ff24b0be6b4474148ff4..db6b98efa2e4700af40c011cfbade2083db9ee5c 100644 (file)
--- 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, [

diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index 9ec4923a39f73fdca1d82cd90b716e03333d5fed..ef2e97d80b7783d64c2b8675dd3be185c3163650 100644 (file)
--- 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.

diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/example-synacor/configure.ac b/sim/example-synacor/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 09cfffc3e5e265dd233a354f8031dbfe23a630ac..99d24c31e1be1405e6b4ce59370cc58880151083 100644 (file)
--- 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.

diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 79b3a8933a285c0ca7da6f079252b16a82a3d03f..08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb 100644 (file)
--- 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])

diff --git a/sim/frv/configure b/sim/frv/configure
index 83cba71e455b3e6a5a86e8ce20f532c92acaab83..f332cd17b77ee96203a3272c2684b64a7b786da6 100755 (executable)
--- 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 :

diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index a03b4f666426a29240701309a7fc6d996f68ec6c..83ad0112844d3f32c3e51860fd55e7e31fceafbc 100644 (file)
--- 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)
 

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index d0a9f0cfe9a2dfd4814da5dc8ee85cf2c292d592..ba229fc601c379a318f839a1c31fb84de2412d45 100644 (file)
--- 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.

diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/ft32/configure b/sim/ft32/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 1c2b5fc557b65e76bcaa82c17a9d63d8a0a785b4..a495f5ff2322863b88587923941ca06d7f6f1c9b 100644 (file)
--- 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.

diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/h8300/configure b/sim/h8300/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 923e7e832e0f9899755d5f985420e9f2eb239544..2b1416b53cdaf47f10273fe9e0c2bf2dce6c2661 100644 (file)
--- 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.

diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 79b3a8933a285c0ca7da6f079252b16a82a3d03f..08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb 100644 (file)
--- 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])

diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 22e88e3de68f9122833ac946ced142682d4a8c00..d191f2ef0e015a357866d3b35a94aa7ff31e1397 100755 (executable)
--- 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 :

diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index c43463394a437880915af46902d61d80f081f684..e35068f31f8c12717aeaefc086b969d28506b5a6 100644 (file)
--- 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)
 

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index d7ee3398f83af73887074aad2e251435d4844db9..c7311160fcf3c8c9d6551d521ac282ba8d513f0a 100644 (file)
--- 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.

diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 79b3a8933a285c0ca7da6f079252b16a82a3d03f..08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb 100644 (file)
--- 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])

diff --git a/sim/lm32/configure b/sim/lm32/configure
index b65aa2516f13601f5957b821e7d57593286d50b0..a50fe6211e8a61e62fdc77e4cfd2c4b001ff452a 100755 (executable)
--- 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 :

diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index b277c963a87f918300de8980524b50ace59b1154..edf7968b3e045d5bb1a299325f6a42a8f3bffcd4 100644 (file)
--- 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)

diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 1c60ffc514c8a9fc21713845b2ca1925a957abbe..aab1e0d12c76e0ed3a16c8cf714203381fb95035 100644 (file)
--- 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.

diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/m32c/configure b/sim/m32c/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac
index 4f2c0ace70bbdd18f771374149d0926c4a60367a..7d86d83f8b205fdc475c892a48a3a78708e69fd3 100644 (file)
--- 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

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index c4a4240bdd8323489aafe4775cc15715a53665b5..688ff0166978bda9cf620a3c9babe76fab47bb73 100644 (file)
--- 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.

diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 79b3a8933a285c0ca7da6f079252b16a82a3d03f..08ac8b16a74506eb7ac2f9e1578c88f172cb6ddb 100644 (file)
--- 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])

diff --git a/sim/m32r/configure b/sim/m32r/configure
index 9acd629ad85a95a95129d96b4b6537bc7c88ba4f..79ce4858a3100cdec25ca97b2d95cf61921f56f4 100755 (executable)
--- 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 :

diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 2e6b415e40654879f3f05e0ae8e7ea5732d4e65c..a45eebdfedffe56906d82d5b5ed3fb358d9ef2b4 100644 (file)
--- 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)
 

diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
deleted file mode 100644 (file)
index e15ec02..0000000
--- a/sim/m4/sim_ac_common.m4
+++ /dev/null
@@ -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

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 797dc4bd0bfe3c811149edca91c16d034c91775b..9f6a877154a89279d787c2ca7b05594f1d681803 100644 (file)
--- 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.

diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index ec81e7b8ead84b38fe2bf6e96e7c6eb8efaf68b3..a1e284288cba50bc8a26bf35e370a7d4780afa5e 100755 (executable)
--- 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"

diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index 986d8addfd866e07edfc0db2caa34f67c1ca9c88..02eccf0ddcb77d6553b1fdad5f1d44a13f189bdd 100644 (file)
--- 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)

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index b0cb3b1f13f9a547e3c9ff701baf85843b5687ee..d2e9b56d63e40ca58e22b9b6044e07f85f7453fa 100644 (file)
--- 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.

diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/mcore/configure b/sim/mcore/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 10200374b2809ced12b07bec57ef2ef38b9d5e30..910ed556601fd3a3a5080151647d39c93388a23b 100644 (file)
--- 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.

diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 93b8fcf33c3dd80b055ecffbefee7e1d04e6dee2..a5685c5756518844358465ec39eb3953c7dfc324 100644 (file)
--- 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.

diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index 3eec4643c25724f69ead95072b00c3de7bbff977..95e62b9d9883edde2e4d135673eb812b9342ecfd 100644 (file)
--- 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])

diff --git a/sim/mips/configure b/sim/mips/configure
index e1362aebd175b5dc2629fe2ffa633ce1ba01d770..4beb1e964d317942e7d80d950abd1e12f7780893 100755 (executable)
--- 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 :

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index d8ce2803aee6240127bc086b052344f78af73929..a8c16b259251c3087f5e8e843fdac3d84c836812 100644 (file)
--- 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)
 

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 9f3fad3b23742cbce75c76f57682fc596d5f8a48..170d679851a254566884e4ca3a3369c08ba2ca95 100644 (file)
--- 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.

diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 02e3ea44dcd690328c31a2326975dd5f265a0389..6032284af5c18488d0374140be78f8c6db17fa71 100644 (file)
--- 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])

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index e7155d6aadd0a826b01dc7ed44ac534268221e46..8efbbc09298685d611a9707f9bc85fba39407c30 100755 (executable)
--- 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 :

diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 1083c062df68c4d6c923316cbfc895a8d2b38ced..e531be971cd7f46a8f09568a42afeded77b06ea3 100644 (file)
--- 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)

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 00c1753f01f43227f2875ab208bd3a072a328147..4c7ee513106c894660e114d09adba7db47e22379 100644 (file)
--- 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).

diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/moxie/configure b/sim/moxie/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- 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

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index c549a0dad91426d2fc145d5ed7d280bacc0cbd04..7902b88d916ea5748ce54276d4603370bc6e391e 100644 (file)
--- 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.

diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- 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])

diff --git a/sim/msp430/configure b/sim/msp430/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- 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"

diff --git a/sim/msp430/configure.ac b/sim/msp430/configure.ac
index 4f2c0ace70bbdd18f771374149d0926c4a60367a..7d86d83f8b205fdc475c892a48a3a78708e69fd3 100644 (file)
--- 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

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 948ae7b66a0dd18a5fedae381c28cd077f350747..682644431db3892a9d39c9f7a91fab5050372f90 100644 (file)
--- 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.

diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index 4b13aea93bfc05099f4f03310a3bf613c25c2f02..c7a63712ed36100d7e7a240eb565a8a837173b74 100644 (file)
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/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])

diff --git a/sim/or1k/configure b/sim/or1k/configure
index 77e90f60a93c6191f65e4c8c882a00814e02b66f..4141f80830d43ed2ee32d8a186979c3e13db3e85 100755 (executable)
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -1687,8 +1687,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
 wire_word_bitsize="32"
 wire_word_msb="31"
 wire_address_bitsize="32"

diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index f77a7339d56a5c2a2a459e7f868feec4581a5665..c72c80c5f47ac9d3df7df49f4437419843864ce2 100644 (file)
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/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([32], [31], [32])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([or1200])

diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index 02128cb3682629644fa6fcceee2b2c3cc0ae3114..7be5775bdd7c94da3d5ba1b467bc15228a0a1b1a 100644 (file)
--- a/sim/pru/ChangeLog
+++ b/sim/pru/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.

diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/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])

diff --git a/sim/pru/configure b/sim/pru/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- a/sim/pru/configure
+++ b/sim/pru/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"

diff --git a/sim/pru/configure.ac b/sim/pru/configure.ac
index 8e9577c9ea2574f0f7fbe31d96bc1002913b149c..ef9f47544a89cdea22f3d1d648e635d11c03e727 100644 (file)
--- a/sim/pru/configure.ac
+++ b/sim/pru/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT

diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index 9ef700f9b600dd5f189f7b2e4aa1e1ebc46a4806..2bef5e819f94394a926fe3a42080a2824dbf5e47 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/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.

diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 68f47bbd15dea2c0d0d7d5668af49cf6f80a7943..14d9979ba2c77ea26c8c80aa0d61f619b79602b9 100644 (file)
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/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])

diff --git a/sim/riscv/configure b/sim/riscv/configure
index 97e09b15e7dd7e9d788fc79ef0f0d712110a9973..0710edfc9f0624b321d963eb2c6fc00f9b4c5f27 100755 (executable)
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -1684,8 +1684,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
 # Select the default model for the target.
 riscv_model=
 case "${target}" in

diff --git a/sim/riscv/configure.ac b/sim/riscv/configure.ac
index e866c8f8f4a0de833a9bf830a0b4bd15a83f446a..01afe511ca8ed8ee00287988b5cd3e1af6e10a86 100644 (file)
--- a/sim/riscv/configure.ac
+++ b/sim/riscv/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
-
 # Select the default model for the target.
 riscv_model=
 case "${target}" in

diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 4502c0608127359b9dade35debaf1edb0b1e8dd1..5937c25f16154c3c8f9c2625ffc056fe1374223a 100644 (file)
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/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.

diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/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])

diff --git a/sim/rl78/configure b/sim/rl78/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- a/sim/rl78/configure
+++ b/sim/rl78/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"

diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index 4f2c0ace70bbdd18f771374149d0926c4a60367a..7d86d83f8b205fdc475c892a48a3a78708e69fd3 100644 (file)
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 62784dc9fd5d45843955feee4d900c4cf7603d8a..e27cba46a62c965cf60e8b701ff14d9215334fe8 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/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.

diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/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])

diff --git a/sim/rx/configure b/sim/rx/configure
index d8e5e4cf4b28b61141522afb5f02aae64886a5fd..e5fbf24568643dea66ce8044395c3e5f87d9bfa2 100755 (executable)
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -1683,8 +1683,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
 # Check whether --enable-cycle-accurate was given.
 if test "${enable_cycle_accurate+set}" = set; then :
   enableval=$enable_cycle_accurate; case "${enableval}" in

diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index b4881f8488c6050e31abf0312d1975de8ecbaa30..78fc33bac37a492966dacfb616e08da5351789d2 100644 (file)
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -21,8 +21,6 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 AC_ARG_ENABLE(cycle-accurate,
 [AS_HELP_STRING([--disable-cycle-accurate],
                [Disable cycle accurate simulation (faster runtime)])],

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 26b4e2121717893d88e5e624979f4c2e958627f6..5db5bc7264c784ffa7c53fef1d4c1e7447543000 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/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.

diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4
index b002c85a28ddba54d9678e32ede4ee9a4266b62c..1e96f107be6e6a3f1e3b9638ebce2fe5798696af 100644 (file)
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/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])

diff --git a/sim/sh/configure b/sim/sh/configure
index d8574779e22991a84b7ad6a7a2dbe33b7f11117b..b62feb4b145b58037aae8d45eae526d201ae8827 100755 (executable)
--- a/sim/sh/configure
+++ b/sim/sh/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"

diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac
index 08bf6ff8acbc03a0be8087aa8afe9a7851974400..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- a/sim/sh/configure.ac
+++ b/sim/sh/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

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 6884c950a3951bf839eaa94ed0855f84ad001c59..9256eb46d832d2e6e6b24dfd8a0eebf890046a14 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/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.

diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4
index 02e3ea44dcd690328c31a2326975dd5f265a0389..6032284af5c18488d0374140be78f8c6db17fa71 100644 (file)
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/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])

diff --git a/sim/v850/configure b/sim/v850/configure
index ffda16d15967c75a1f1d2612a464a68d73e9277b..c4fbe28e9c787d60c2555bc02ac7df3b83df104b 100755 (executable)
--- a/sim/v850/configure
+++ b/sim/v850/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 :

diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index c3cd64627c0afb2d23fb8f324c9ca3fafe6a14e5..74eb1fa54685fd6ab519a7fa0f7df626558a3b40 100644 (file)
--- a/sim/v850/configure.ac
+++ b/sim/v850/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)