diff options
Diffstat (limited to 'sim/or1k')
| -rw-r--r-- | sim/or1k/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/or1k/aclocal.m4 | 13 | ||||
| -rwxr-xr-x | sim/or1k/configure | 27 | ||||
| -rw-r--r-- | sim/or1k/configure.ac | 2 |
4 files changed, 37 insertions, 10 deletions
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index ca31ff0..01a2dd7 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/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/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index 1c83b20..14d865b 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([../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_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_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/or1k/configure b/sim/or1k/configure index 7be2226..b52bd90 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -631,6 +631,11 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +sim_reserved_bits +sim_hw +sim_hw_objs +sim_hw_cflags +sim_float cgen_breaks cgen cgendir @@ -750,15 +755,10 @@ 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_inline sim_endian +sim_default_model sim_bitsize sim_alignment' ac_subst_files='' @@ -11804,7 +11804,6 @@ _ACEOF - wire_endian="BIG" default_endian="" # Check whether --enable-sim-endian was given. @@ -12158,6 +12157,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/or1k/configure.ac b/sim/or1k/configure.ac index a025e03..ed0739f 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/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 |