sim: regen against sim/m4/

My scripts weren't updated to use new -I../m4 as the first arg.

62 files changed, 429 insertions, 305 deletions

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 14383bc..67bb40a 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 779e6c7..6a39e1d 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index e4870da..d247a07 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index c423620..5f3ec62 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index f096a64..9337e85 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_default_model.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -122,3 +111,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_default_model.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index cbe7ab9..0509ae5 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index eab07e3..73a795c 100644
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 9550483..fe9b0b6 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 845fee3..f8b6693 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 116cb98..e144fa3 100644
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index c5188a4..3fe2e50 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index cfd9c6f..3853726 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index 361c39e..db8c5cd 100644
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index 49b1c8f..ac77bb5 100644
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 4db8dda..f62dd62 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 116cb98..e144fa3 100644
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index e54033e..5a2cfd7 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 4edf68e..c296299 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 820fefe..08f7ca5 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 116cb98..e144fa3 100644
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 45f3027..d8f38ef 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 116cb98..e144fa3 100644
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 8b6432b..47370c6 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index 361c39e..db8c5cd 100644
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 54d4427..f5bdba7 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 116cb98..e144fa3 100644
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index b5dab1e..d671162 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index 2438413..4300d0e 100644
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/aclocal.m4
@@ -98,16 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -120,3 +110,13 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index eb4c9bc..20e73b1 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 5369296..1691bbc 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 90ca806..e2a0c45 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index d524b5d..5573dad 100644
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_reserved_bits.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 41a3f52..f38a6fb 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 17cbdb3..02c1113 100644
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -98,18 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_reserved_bits.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -122,3 +110,15 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_reserved_bits.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 089fa51..b42e547 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 1257a5d..cf4c77e 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index e3853dd..8e1a543 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index eab07e3..73a795c 100644
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index e6a7937..4a0ddcf 100644
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index 3efbf7f..9089ef5 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 539933d..bc1ef46 100644
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_default_model.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -121,3 +110,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_default_model.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 25957f9..33b0d23 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index 361c39e..db8c5cd 100644
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index fa7e489..97d2918 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index 361c39e..db8c5cd 100644
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 7d08660..03ba4dc 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4
index 78a0489..ddeb1f5 100644
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 5a990b3..3497d44 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-04-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* configure: Regenerate.
diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4
index e798f0b..a0d32d4 100644
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_reserved_bits.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -121,3 +110,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_reserved_bits.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])