4 files changed, 35 insertions, 8 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 5e83355..6613c3c 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.
+	* aclocal.m4, configure: Regenerate.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Replace sinclude with AC_CONFIG_MACRO_DIRS.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 1c83b20..155b726 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([../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_cgen_maint.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_scache.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +122,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
diff --git a/sim/cris/configure b/sim/cris/configure
index 3c0330b..82d65be 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -631,6 +631,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_float
+sim_bitsize
 cgen_breaks
 cgen
 cgendir
@@ -750,16 +753,13 @@ PATH_SEPARATOR
 SHELL
 WERROR_CFLAGS
 WARN_CFLAGS
-sim_reserved_bits
+sim_scache
 sim_inline
 sim_hw
 sim_hw_objs
 sim_hw_cflags
-sim_default_model
-sim_scache
-sim_float
 sim_endian
-sim_bitsize
+sim_default_model
 sim_alignment'
 ac_subst_files=''
 ac_user_opts='
@@ -11804,7 +11804,6 @@ _ACEOF
 
 
 
-
 # For dv-rv and rvdummy.
 for ac_header in sys/socket.h sys/select.h sys/param.h
 do :
@@ -12202,6 +12201,18 @@ ac_config_commands="$ac_config_commands Makefile"
 
 ac_config_commands="$ac_config_commands stamp-h"
 
+
+
+
+
+
+
+
+
+
+
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 5bf2313..1eee817 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON