[binutils-gdb] sim: delete SIM_AC_COMMON macro
Michael Frysinger
vapier@sourceware.org
Sun Jun 20 04:40:21 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39
commit 3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat Jun 19 01:36:30 2021 -0400
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:
---
sim/ChangeLog | 5 +++++
sim/README-HACKING | 9 ---------
sim/aarch64/ChangeLog | 5 +++++
sim/aarch64/aclocal.m4 | 1 -
sim/aarch64/configure | 2 --
sim/aarch64/configure.ac | 2 --
sim/arm/ChangeLog | 5 +++++
sim/arm/aclocal.m4 | 1 -
sim/arm/configure | 2 --
sim/arm/configure.ac | 2 --
sim/avr/ChangeLog | 5 +++++
sim/avr/aclocal.m4 | 1 -
sim/avr/configure | 2 --
sim/avr/configure.ac | 2 --
sim/bfin/ChangeLog | 5 +++++
sim/bfin/aclocal.m4 | 1 -
sim/bfin/configure | 2 --
sim/bfin/configure.ac | 2 --
sim/bpf/ChangeLog | 5 +++++
sim/bpf/aclocal.m4 | 1 -
sim/bpf/configure | 2 --
sim/bpf/configure.ac | 2 --
sim/cr16/ChangeLog | 5 +++++
sim/cr16/aclocal.m4 | 1 -
sim/cr16/configure | 2 --
sim/cr16/configure.ac | 2 --
sim/cris/ChangeLog | 5 +++++
sim/cris/aclocal.m4 | 1 -
sim/cris/configure | 2 --
sim/cris/configure.ac | 2 --
sim/d10v/ChangeLog | 5 +++++
sim/d10v/aclocal.m4 | 1 -
sim/d10v/configure | 2 --
sim/d10v/configure.ac | 2 --
sim/erc32/ChangeLog | 5 +++++
sim/erc32/aclocal.m4 | 1 -
sim/erc32/configure | 2 --
sim/erc32/configure.ac | 2 --
sim/example-synacor/ChangeLog | 5 +++++
sim/example-synacor/aclocal.m4 | 1 -
sim/example-synacor/configure | 2 --
sim/example-synacor/configure.ac | 2 --
sim/frv/ChangeLog | 5 +++++
sim/frv/aclocal.m4 | 1 -
sim/frv/configure | 2 --
sim/frv/configure.ac | 2 --
sim/ft32/ChangeLog | 5 +++++
sim/ft32/aclocal.m4 | 1 -
sim/ft32/configure | 2 --
sim/ft32/configure.ac | 2 --
sim/h8300/ChangeLog | 5 +++++
sim/h8300/aclocal.m4 | 1 -
sim/h8300/configure | 2 --
sim/h8300/configure.ac | 2 --
sim/iq2000/ChangeLog | 5 +++++
sim/iq2000/aclocal.m4 | 1 -
sim/iq2000/configure | 2 --
sim/iq2000/configure.ac | 2 --
sim/lm32/ChangeLog | 5 +++++
sim/lm32/aclocal.m4 | 1 -
sim/lm32/configure | 2 --
sim/lm32/configure.ac | 2 --
sim/m32c/ChangeLog | 5 +++++
sim/m32c/aclocal.m4 | 1 -
sim/m32c/configure | 2 --
sim/m32c/configure.ac | 2 --
sim/m32r/ChangeLog | 5 +++++
sim/m32r/aclocal.m4 | 1 -
sim/m32r/configure | 2 --
sim/m32r/configure.ac | 2 --
sim/m4/sim_ac_common.m4 | 24 ------------------------
sim/m68hc11/ChangeLog | 5 +++++
sim/m68hc11/aclocal.m4 | 1 -
sim/m68hc11/configure | 2 --
sim/m68hc11/configure.ac | 2 --
sim/mcore/ChangeLog | 5 +++++
sim/mcore/aclocal.m4 | 1 -
sim/mcore/configure | 2 --
sim/mcore/configure.ac | 2 --
sim/microblaze/ChangeLog | 5 +++++
sim/microblaze/aclocal.m4 | 1 -
sim/microblaze/configure | 2 --
sim/microblaze/configure.ac | 2 --
sim/mips/ChangeLog | 5 +++++
sim/mips/aclocal.m4 | 1 -
sim/mips/configure | 2 --
sim/mips/configure.ac | 2 --
sim/mn10300/ChangeLog | 5 +++++
sim/mn10300/aclocal.m4 | 1 -
sim/mn10300/configure | 2 --
sim/mn10300/configure.ac | 2 --
sim/moxie/ChangeLog | 5 +++++
sim/moxie/aclocal.m4 | 1 -
sim/moxie/configure | 2 --
sim/moxie/configure.ac | 2 --
sim/msp430/ChangeLog | 5 +++++
sim/msp430/aclocal.m4 | 1 -
sim/msp430/configure | 2 --
sim/msp430/configure.ac | 2 --
sim/or1k/ChangeLog | 5 +++++
sim/or1k/aclocal.m4 | 1 -
sim/or1k/configure | 2 --
sim/or1k/configure.ac | 2 --
sim/pru/ChangeLog | 5 +++++
sim/pru/aclocal.m4 | 1 -
sim/pru/configure | 2 --
sim/pru/configure.ac | 2 --
sim/riscv/ChangeLog | 5 +++++
sim/riscv/aclocal.m4 | 1 -
sim/riscv/configure | 2 --
sim/riscv/configure.ac | 2 --
sim/rl78/ChangeLog | 5 +++++
sim/rl78/aclocal.m4 | 1 -
sim/rl78/configure | 2 --
sim/rl78/configure.ac | 2 --
sim/rx/ChangeLog | 5 +++++
sim/rx/aclocal.m4 | 1 -
sim/rx/configure | 2 --
sim/rx/configure.ac | 2 --
sim/sh/ChangeLog | 5 +++++
sim/sh/aclocal.m4 | 1 -
sim/sh/configure | 2 --
sim/sh/configure.ac | 2 --
sim/v850/ChangeLog | 5 +++++
sim/v850/aclocal.m4 | 1 -
sim/v850/configure | 2 --
sim/v850/configure.ac | 2 --
127 files changed, 160 insertions(+), 188 deletions(-)
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 9bbf9e757f6..5ccfdba42df 100644
--- 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 d4867c9e79e..3715467337f 100644
--- 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 1467a07bbf9..7ca821934c1 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 849e957f827..3d4290ac3f4 100644
--- 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 ad31dd250ce..164c785c437 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 9637f7527d0..e200f2001db 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 30c2c77d10f..e3e352a84d3 100644
--- 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 5d4500855da..abca26eeaa0 100644
--- 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 5f645670439..0453baeab95 100755
--- 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 9b17dc4212f..4e31c6f1359 100644
--- 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 339857ebc0f..e31f509572d 100644
--- 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 4b13aea93bf..c7a63712ed3 100644
--- 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 2c0d9a8beae..e07b470a6c0 100755
--- 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 13516a0914e..32729370b5a 100644
--- 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 54a8ce82d03..15b31dc4819 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 85745016b5b..ad25fc4dd20 100644
--- 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 79b3a8933a2..08ac8b16a74 100644
--- 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 b1735854784..4c45fc6e044 100755
--- 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 909c41653f1..13500a09a49 100644
--- 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 2990f4e6d39..e0c518c93c3 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 38da15a064c..ef7025f212d 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 4fda8efe4f9..cc8c9bec87d 100755
--- 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 3cb35d80f57..db6b98efa2e 100644
--- 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 9ec4923a39f..ef2e97d80b7 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 09cfffc3e5e..99d24c31e1b 100644
--- 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 79b3a8933a2..08ac8b16a74 100644
--- 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 83cba71e455..f332cd17b77 100755
--- 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 a03b4f66642..83ad0112844 100644
--- 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 d0a9f0cfe9a..ba229fc601c 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 1c2b5fc557b..a495f5ff232 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 923e7e832e0..2b1416b53cd 100644
--- 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 79b3a8933a2..08ac8b16a74 100644
--- 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 22e88e3de68..d191f2ef0e0 100755
--- 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 c43463394a4..e35068f31f8 100644
--- 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 d7ee3398f83..c7311160fcf 100644
--- 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 79b3a8933a2..08ac8b16a74 100644
--- 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 b65aa2516f1..a50fe6211e8 100755
--- 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 b277c963a87..edf7968b3e0 100644
--- 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 1c60ffc514c..aab1e0d12c7 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 4f2c0ace70b..7d86d83f8b2 100644
--- 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 c4a4240bdd8..688ff016697 100644
--- 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 79b3a8933a2..08ac8b16a74 100644
--- 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 9acd629ad85..79ce4858a31 100755
--- 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 2e6b415e406..a45eebdfedf 100644
--- 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
index e15ec02edf9..00000000000
--- 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 797dc4bd0bf..9f6a877154a 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 ec81e7b8ead..a1e284288cb 100755
--- 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 986d8addfd8..02eccf0ddcb 100644
--- 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 b0cb3b1f13f..d2e9b56d63e 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 10200374b28..910ed556601 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 93b8fcf33c3..a5685c57565 100644
--- 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 3eec4643c25..95e62b9d988 100644
--- 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 e1362aebd17..4beb1e964d3 100755
--- 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 d8ce2803aee..a8c16b25925 100644
--- 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 9f3fad3b237..170d679851a 100644
--- 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 02e3ea44dcd..6032284af5c 100644
--- 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 e7155d6aadd..8efbbc09298 100755
--- 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 1083c062df6..e531be971cd 100644
--- 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 00c1753f01f..4c7ee513106 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 c549a0dad91..7902b88d916 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 4f2c0ace70b..7d86d83f8b2 100644
--- 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 948ae7b66a0..682644431db 100644
--- 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 4b13aea93bf..c7a63712ed3 100644
--- 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 77e90f60a93..4141f80830d 100755
--- 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 f77a7339d56..c72c80c5f47 100644
--- 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 02128cb3682..7be5775bdd7 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 8e9577c9ea2..ef9f47544a8 100644
--- 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 9ef700f9b60..2bef5e819f9 100644
--- 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 68f47bbd15d..14d9979ba2c 100644
--- 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 97e09b15e7d..0710edfc9f0 100755
--- 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 e866c8f8f4a..01afe511ca8 100644
--- 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 4502c060812..5937c25f161 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 4f2c0ace70b..7d86d83f8b2 100644
--- 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 62784dc9fd5..e27cba46a62 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8e5e4cf4b2..e5fbf245686 100755
--- 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 b4881f8488c..78fc33bac37 100644
--- 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 26b4e212171..5db5bc7264c 100644
--- 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 b002c85a28d..1e96f107be6 100644
--- 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 d8574779e22..b62feb4b145 100755
--- 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 08bf6ff8acb..99370b3a577 100644
--- 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 6884c950a39..9256eb46d83 100644
--- 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 02e3ea44dcd..6032284af5c 100644
--- 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 ffda16d1596..c4fbe28e9c7 100755
--- 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 c3cd64627c0..74eb1fa5468 100644
--- 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)
More information about the Gdb-cvs
mailing list