aboutsummaryrefslogtreecommitdiff
path: root/sim/microblaze
diff options
context:
space:
mode:
Diffstat (limited to 'sim/microblaze')
-rw-r--r--sim/microblaze/ChangeLog5
-rw-r--r--sim/microblaze/aclocal.m49
-rwxr-xr-xsim/microblaze/configure29
-rw-r--r--sim/microblaze/configure.ac2
4 files changed, 34 insertions, 11 deletions
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index a618349..b93e311 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/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/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 1c83b20..3326ca9 100644
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@@ -98,6 +98,14 @@ 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([../../config/acx.m4])
m4_include([../../config/depstand.m4])
m4_include([../../config/gettext-sister.m4])
@@ -110,4 +118,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/microblaze/configure b/sim/microblaze/configure
index 7236ae1..55e854a 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -631,6 +631,14 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
+sim_reserved_bits
+sim_hw
+sim_hw_objs
+sim_hw_cflags
+sim_default_model
+sim_scache
+sim_float
+sim_bitsize
cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
@@ -747,16 +755,8 @@ PATH_SEPARATOR
SHELL
WERROR_CFLAGS
WARN_CFLAGS
-sim_reserved_bits
sim_inline
-sim_hw
-sim_hw_objs
-sim_hw_cflags
-sim_default_model
-sim_scache
-sim_float
sim_endian
-sim_bitsize
sim_alignment'
ac_subst_files=''
ac_user_opts='
@@ -11791,7 +11791,6 @@ _ACEOF
-
wire_endian=""
default_endian=""
# Check whether --enable-sim-endian was given.
@@ -11999,6 +11998,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/microblaze/configure.ac b/sim/microblaze/configure.ac
index e1300c8..88fac82 100644
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/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