sim: common: split up acinclude.m4 into individual m4 files
authorMike Frysinger <vapier@gentoo.org>
Sun, 7 Feb 2021 03:51:30 +0000 (22:51 -0500)
committerMike Frysinger <vapier@gentoo.org>
Sun, 21 Feb 2021 07:20:19 +0000 (02:20 -0500)
This file is quite large and is getting unmanageable.  Split it apart
to follow aclocal best practices by putting one-macro-per-file.  There
shouldn't be any real functional changes here as can be seen in the
configure script regens.

144 files changed:
sim/ChangeLog
sim/aarch64/ChangeLog
sim/aarch64/aclocal.m4
sim/aarch64/configure
sim/aarch64/configure.ac
sim/arm/ChangeLog
sim/arm/aclocal.m4
sim/arm/configure
sim/arm/configure.ac
sim/avr/ChangeLog
sim/avr/aclocal.m4
sim/avr/configure
sim/avr/configure.ac
sim/bfin/ChangeLog
sim/bfin/aclocal.m4
sim/bfin/configure
sim/bfin/configure.ac
sim/bpf/ChangeLog
sim/bpf/aclocal.m4
sim/bpf/configure
sim/bpf/configure.ac
sim/common/ChangeLog
sim/common/acinclude.m4 [deleted file]
sim/cr16/ChangeLog
sim/cr16/aclocal.m4
sim/cr16/configure
sim/cr16/configure.ac
sim/cris/ChangeLog
sim/cris/aclocal.m4
sim/cris/configure
sim/cris/configure.ac
sim/d10v/ChangeLog
sim/d10v/aclocal.m4
sim/d10v/configure
sim/d10v/configure.ac
sim/erc32/ChangeLog
sim/erc32/aclocal.m4
sim/erc32/configure
sim/erc32/configure.ac
sim/frv/ChangeLog
sim/frv/aclocal.m4
sim/frv/configure
sim/frv/configure.ac
sim/ft32/ChangeLog
sim/ft32/aclocal.m4
sim/ft32/configure
sim/ft32/configure.ac
sim/h8300/ChangeLog
sim/h8300/aclocal.m4
sim/h8300/configure
sim/h8300/configure.ac
sim/igen/ChangeLog
sim/igen/configure
sim/igen/configure.ac
sim/iq2000/ChangeLog
sim/iq2000/aclocal.m4
sim/iq2000/configure
sim/iq2000/configure.ac
sim/lm32/ChangeLog
sim/lm32/aclocal.m4
sim/lm32/configure
sim/lm32/configure.ac
sim/m32c/ChangeLog
sim/m32c/aclocal.m4
sim/m32c/configure
sim/m32c/configure.ac
sim/m32r/ChangeLog
sim/m32r/aclocal.m4
sim/m32r/configure
sim/m32r/configure.ac
sim/m4/sim_ac_common.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_alignment.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_assert.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_bitsize.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_cgen_maint.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_default_model.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_endian.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_environment.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_float.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_hardware.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_inline.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_reserved_bits.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_scache.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_smp.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_warnings.m4 [new file with mode: 0644]
sim/m4/sim_ac_option_xor_endian.m4 [new file with mode: 0644]
sim/m4/sim_ac_output.m4 [new file with mode: 0644]
sim/m68hc11/ChangeLog
sim/m68hc11/aclocal.m4
sim/m68hc11/configure
sim/m68hc11/configure.ac
sim/mcore/ChangeLog
sim/mcore/aclocal.m4
sim/mcore/configure
sim/mcore/configure.ac
sim/microblaze/ChangeLog
sim/microblaze/aclocal.m4
sim/microblaze/configure
sim/microblaze/configure.ac
sim/mips/ChangeLog
sim/mips/aclocal.m4
sim/mips/configure
sim/mips/configure.ac
sim/mn10300/ChangeLog
sim/mn10300/aclocal.m4
sim/mn10300/configure
sim/mn10300/configure.ac
sim/moxie/ChangeLog
sim/moxie/aclocal.m4
sim/moxie/configure
sim/moxie/configure.ac
sim/msp430/ChangeLog
sim/msp430/aclocal.m4
sim/msp430/configure
sim/msp430/configure.ac
sim/or1k/ChangeLog
sim/or1k/aclocal.m4
sim/or1k/configure
sim/or1k/configure.ac
sim/ppc/configure.ac
sim/pru/ChangeLog
sim/pru/aclocal.m4
sim/pru/configure
sim/pru/configure.ac
sim/riscv/ChangeLog
sim/riscv/aclocal.m4
sim/riscv/configure
sim/riscv/configure.ac
sim/rl78/ChangeLog
sim/rl78/aclocal.m4
sim/rl78/configure
sim/rl78/configure.ac
sim/rx/ChangeLog
sim/rx/aclocal.m4
sim/rx/configure
sim/rx/configure.ac
sim/sh/ChangeLog
sim/sh/aclocal.m4
sim/sh/configure
sim/sh/configure.ac
sim/v850/ChangeLog
sim/v850/aclocal.m4
sim/v850/configure
sim/v850/configure.ac

index 0014a9a6ac9c6594e69cf24bfa33ac190353e54c..f96a5dd93a219f86cc5f00300aa6798ca7a7bca9 100644 (file)
@@ -1,3 +1,15 @@
+2021-02-21  Mike Frysinger  <vapier@gentoo.org>
+
+       * m4/sim_ac_common.m4, m4/sim_ac_option_alignment.m4,
+       m4/sim_ac_option_assert.m4, m4/sim_ac_option_bitsize.m4,
+       m4/sim_ac_option_cgen_maint.m4, m4/sim_ac_option_default_model.m4,
+       m4/sim_ac_option_endian.m4, m4/sim_ac_option_environment.m4,
+       m4/sim_ac_option_float.m4, m4/sim_ac_option_hardware.m4,
+       m4/sim_ac_option_inline.m4, m4/sim_ac_option_reserved_bits.m4,
+       m4/sim_ac_option_scache.m4, m4/sim_ac_option_smp.m4,
+       m4/sim_ac_option_warnings.m4, m4/sim_ac_option_xor_endian.m4,
+       m4/sim_ac_output.m4: New files.
+
 2021-02-20  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.tgt: Move arch list ...
index c6ecd7f97be189700a50f6e7a6c4f2778bdf52eb..4ab3c0d588f43a2b49fa7c4d431a3d38dbbbfbec 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 72161e986f899b5bdff45c4a6b005782b331d3c0..b4c87d90df15fd11e2efdfb02479b636152e1030 100755 (executable)
@@ -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.
@@ -12003,6 +12002,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
index 8ce7772379c4b1cd585b3b752e018fe610541195..1c212dc2c95528a1275a298cb3fff2b4612f83fc 100644 (file)
@@ -20,7 +20,7 @@ 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/>.  */
 
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
index ff9b1f8fc23c2e84c549aeefe74c4d83ec553ebb..9574e7f022d02648e91490117053cab8c23ecafd 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 7236ae17aefd71991fcbc714391702a73a1bb919..55e854ad2b2df33fd48dd1792e686b97b02bd311 100755 (executable)
@@ -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
index e1300c85abc2a91fa9ac32408826c3d4fac258ab..88fac82e7b4c19712e6221b9d1c583b592ad599d 100644 (file)
@@ -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
 
index 249f634ec8d2714f949ca94f6bf3f4c31bd09ccb..71323f81e817e3f6c85db4cb51d29022e1aa5893 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 84107ef082bc97a9fd51d56101499d7cb1998ede..13fe9653d3fd3ecb2dc7a47aafbf3db0c1bdbe2d 100755 (executable)
@@ -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="LITTLE"
 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
index 165b3d83a3c59a382d103980f9f352c97589e339..92046a1762dd211c80bd69a9267dbb04b67d59a5 100644 (file)
@@ -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
 
index 1909707c66c1075060178935d79bbace65a3ab48..5ec53e8f584b9782542c9d2801da979f63017f1b 100644 (file)
@@ -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.
index 9c7434a2c886ced5a410d389e736c0f7d66be194..8928f4ccba25e36f8098a1530d7d5d13b3773241 100644 (file)
@@ -98,6 +98,16 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -111,4 +121,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 599735c8addfca353691e9f766804fe85a62e32b..706de9aa4ac94e0c9e73d323df9dc0d4937a74eb 100755 (executable)
@@ -631,6 +631,10 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_scache
+sim_float
+sim_bitsize
 cgen_breaks
 SDL_LIBS
 SDL_CFLAGS
@@ -752,16 +756,12 @@ 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_default_model
 sim_alignment'
 ac_subst_files=''
 ac_user_opts='
@@ -11814,7 +11814,6 @@ _ACEOF
 
 
 
-
 wire_endian="LITTLE"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12474,6 +12473,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
index 5c70ba7758ed2e2a3dbf80e82b5c5c849dcbd1c8..0ca02ba78b86a67714959d6aeca131680fb0cb3f 100644 (file)
@@ -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
 
index cd934adacc88524357cec346a62f6689cf6b01d5..a042b7fba543608e469004e7f140fbac50dcd487 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..14d865b222e0476da3e12e5b7319fa96fba4acc5 100644 (file)
@@ -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])
index f9aa6aa9652037f9d497e56b37559f3efd845daa..0633f8586fdfae911f70b7757785e9fa9f901296 100755 (executable)
@@ -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=''
@@ -11803,7 +11803,6 @@ _ACEOF
 
 
 
-
 wire_word_bitsize="64"
 wire_word_msb=""
 wire_address_bitsize=""
@@ -12136,6 +12135,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
index 4e08e2cb38edb33684f389c562c612a1f172a091..a0f8576fc39237ca1aa27b341cf9cd9b1ea9017d 100644 (file)
@@ -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
 
index faf02b3f17f17b6b919fb8f4d1bc14757aed933d..75df703075c25fae3f23fa24c5e44fa46d3209c5 100644 (file)
@@ -1,3 +1,7 @@
+2021-02-21  Mike Frysinger  <vapier@gentoo.org>
+
+       * acinclude.m4: Removed.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * acinclude.m4: Delete all sinclude & m4_include calls.
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
deleted file mode 100644 (file)
index 1337a04..0000000
+++ /dev/null
@@ -1,875 +0,0 @@
-# This file contains common code used by all simulators.
-#
-# SIM_AC_COMMON invokes AC macros used by all simulators and by the common
-# directory.  It is intended to be invoked before any target specific stuff.
-# SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
-# It is intended to be invoked last.
-#
-# See README-HACKING for more details.
-
-AC_DEFUN([SIM_AC_COMMON],
-[
-AC_REQUIRE([AC_PROG_CC])
-AC_CONFIG_HEADERS([config.h:config.in])
-AC_CANONICAL_SYSTEM
-AC_USE_SYSTEM_EXTENSIONS
-AC_C_BIGENDIAN
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-
-# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-fi
-AC_SUBST(CC_FOR_BUILD)
-
-AC_SUBST(CFLAGS)
-AR=${AR-ar}
-AC_SUBST(AR)
-AC_PROG_RANLIB
-
-# Require C11 or newer.  Autoconf-2.70 provides ac_cv_prog_cc_c11 when using
-# AC_PROG_CC, but we're still using Autoconf-2.69, and the newest it understands
-# is C99.  So handle it ourselves.
-m4_version_prereq([2.70], [AC_MSG_ERROR([clean this up!])], [:])
-C_DIALECT=
-AC_MSG_CHECKING([whether C11 is supported by default])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "C11 support not found"
-#endif
-])], [AC_MSG_RESULT([yes])], [
-  AC_MSG_RESULT([no])
-  AC_MSG_CHECKING([for -std=c11 support])
-  ac_save_CC="$CC"
-  CC="$CC -std=c11"
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "C11 support not found"
-#endif
-])], [
-  AC_MSG_RESULT([yes])
-  CC="$ac_save_CC"
-  C_DIALECT="-std=c11"
-], [AC_MSG_ERROR([C11 is required])])])
-AC_SUBST(C_DIALECT)
-
-# Some of the common include files depend on bfd.h, and bfd.h checks
-# that config.h is included first by testing that the PACKAGE macro
-# is defined.
-PACKAGE=sim
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
-AC_SUBST(PACKAGE)
-
-# Dependency checking.
-ZW_CREATE_DEPDIR
-ZW_PROG_COMPILER_DEPENDENCIES([CC])
-
-# Check for the 'make' the user wants to use.
-AC_CHECK_PROGS(MAKE, make)
-MAKE_IS_GNU=
-case "`$MAKE --version 2>&1 | sed 1q`" in
-  *GNU*)
-    MAKE_IS_GNU=yes
-    ;;
-esac
-AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes)
-
-dnl We don't use gettext, but bfd does.  So we do the appropriate checks
-dnl to see if there are intl libraries we should link against.
-ALL_LINGUAS=
-ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
-
-# Check for common headers.
-# NB: You can assume C11 headers exist.
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(sys/time.h sys/times.h sys/resource.h sys/mman.h)
-AC_CHECK_HEADERS(fcntl.h fpu_control.h)
-AC_CHECK_HEADERS(dlfcn.h sys/stat.h)
-AC_CHECK_FUNCS(getrusage time sigaction __setfpucw)
-AC_CHECK_FUNCS(mmap munmap lstat truncate ftruncate posix_fallocate)
-AC_CHECK_MEMBERS([[struct stat.st_dev], [struct stat.st_ino],
-[struct stat.st_mode], [struct stat.st_nlink], [struct stat.st_uid],
-[struct stat.st_gid], [struct stat.st_rdev], [struct stat.st_size],
-[struct stat.st_blksize], [struct stat.st_blocks], [struct stat.st_atime],
-[struct stat.st_mtime], [struct stat.st_ctime]], [], [],
-[[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif]])
-AC_CHECK_TYPES(socklen_t, [], [],
-[#include <sys/types.h>
-#include <sys/socket.h>
-])
-
-# Check for socket libraries
-AC_CHECK_LIB(socket, bind)
-AC_CHECK_LIB(nsl, gethostbyname)
-
-# BFD conditionally uses zlib, so we must link it in if libbfd does, by
-# using the same condition.
-AM_ZLIB
-
-# BFD uses libdl when when plugins enabled.
-AC_PLUGINS
-AM_CONDITIONAL(PLUGINS, test "$plugins" = yes)
-LT_INIT([dlopen])
-AC_SUBST(lt_cv_dlopen_libs)
-
-dnl Standard (and optional) simulator options.
-dnl Eventually all simulators will support these.
-dnl Do not add any here that cannot be supported by all simulators.
-dnl Do not add similar but different options to a particular simulator,
-dnl all shall eventually behave the same way.
-
-
-dnl We don't use automake, but we still want to support
-dnl --enable-maintainer-mode.
-AM_MAINTAINER_MODE
-
-
-dnl --enable-sim-debug is for developers of the simulator
-dnl the allowable values are work-in-progress
-AC_MSG_CHECKING([for sim debug setting])
-sim_debug="0"
-AC_ARG_ENABLE(sim-debug,
-[AS_HELP_STRING([--enable-sim-debug=opts],
-               [Enable debugging flags (for developers of the sim itself)])],
-[case "${enableval}" in
-  yes) sim_debug="7";;
-  no)  sim_debug="0";;
-  *)   sim_debug="($enableval)";;
-esac])dnl
-if test "$sim_debug" != "0"; then
-  AC_DEFINE_UNQUOTED([DEBUG], [$sim_debug], [Sim debug setting])
-fi
-AC_DEFINE_UNQUOTED([WITH_DEBUG], [$sim_debug], [Sim debug setting])
-AC_MSG_RESULT($sim_debug)
-
-
-dnl --enable-sim-stdio is for users of the simulator
-dnl It determines if IO from the program is routed through STDIO (buffered)
-AC_MSG_CHECKING([for sim stdio debug behavior])
-sim_stdio="0"
-AC_ARG_ENABLE(sim-stdio,
-[AS_HELP_STRING([--enable-sim-stdio],
-               [Specify whether to use stdio for console input/output])],
-[case "${enableval}" in
-  yes) sim_stdio="DO_USE_STDIO";;
-  no)  sim_stdio="DONT_USE_STDIO";;
-  *)   AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-stdio]);;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_STDIO], [$sim_stdio], [How to route I/O])
-AC_MSG_RESULT($sim_stdio)
-
-
-dnl --enable-sim-trace is for users of the simulator
-dnl The argument is either a bitmask of things to enable [exactly what is
-dnl up to the simulator], or is a comma separated list of names of tracing
-dnl elements to enable.  The latter is only supported on simulators that
-dnl use WITH_TRACE.  Default to all tracing but internal debug.
-AC_MSG_CHECKING([for sim trace settings])
-sim_trace="~TRACE_debug"
-AC_ARG_ENABLE(sim-trace,
-[AS_HELP_STRING([--enable-sim-trace=opts],
-               [Enable tracing of simulated programs])],
-[case "${enableval}" in
-  yes) sim_trace="-1";;
-  no)  sim_trace="0";;
-  [[-0-9]]*)
-       sim_trace="'(${enableval})'";;
-  [[[:lower:]]]*)
-       sim_trace=""
-       for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-         if test x"$sim_trace" = x; then
-           sim_trace="(TRACE_$x"
-         else
-           sim_trace="${sim_trace}|TRACE_$x"
-         fi
-       done
-       sim_trace="$sim_trace)" ;;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_TRACE], [$sim_trace], [Sim trace settings])
-AC_MSG_RESULT($sim_trace)
-
-
-dnl --enable-sim-profile
-dnl The argument is either a bitmask of things to enable [exactly what is
-dnl up to the simulator], or is a comma separated list of names of profiling
-dnl elements to enable.  The latter is only supported on simulators that
-dnl use WITH_PROFILE.
-AC_MSG_CHECKING([for sim profile settings])
-profile="1"
-sim_profile="-1"
-AC_ARG_ENABLE(sim-profile,
-[AS_HELP_STRING([--enable-sim-profile=opts], [Enable profiling flags])],
-[case "${enableval}" in
-  yes) profile="1" sim_profile="-1";;
-  no)  profile="0" sim_profile="0";;
-  [[-0-9]]*)
-       profile="(${enableval})" sim_profile="(${enableval})";;
-  [[a-z]]*)
-    profile="1"
-       sim_profile=""
-       for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-         if test x"$sim_profile" = x; then
-           sim_profile="(PROFILE_$x"
-         else
-           sim_profile="${sim_profile}|PROFILE_$x"
-         fi
-       done
-       sim_profile="$sim_profile)" ;;
-esac])dnl
-AC_DEFINE_UNQUOTED([PROFILE], [$profile], [Sim profile settings])
-AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings])
-AC_MSG_RESULT($sim_profile)
-
-
-SIM_AC_OPTION_ASSERT
-SIM_AC_OPTION_ENVIRONMENT
-SIM_AC_OPTION_INLINE
-
-ACX_PKGVERSION([SIM])
-ACX_BUGURL([https://www.gnu.org/software/gdb/bugs/])
-AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
-AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
-
-dnl Types used by common code
-AC_TYPE_SIGNAL
-
-dnl Detect exe extension
-AC_EXEEXT
-
-]) dnl End of SIM_AC_COMMON
-
-
-dnl Additional SIM options that can (optionally) be configured
-dnl For optional simulator options, a macro SIM_AC_OPTION_* is defined.
-dnl Simulators that wish to use the relevant option specify the macro
-dnl in the simulator specific configure.ac file between the SIM_AC_COMMON
-dnl and SIM_AC_OUTPUT lines.
-
-
-dnl Specify the running environment.
-dnl If the simulator invokes this in its configure.ac then without this option
-dnl the default is the user environment and all are runtime selectable.
-dnl If the simulator doesn't invoke this, only the user environment is
-dnl supported.
-dnl ??? Until there is demonstrable value in doing something more complicated,
-dnl let's not.
-AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT],
-[
-AC_MSG_CHECKING([default sim environment setting])
-sim_environment="ALL_ENVIRONMENT"
-AC_ARG_ENABLE(sim-environment,
-[AS_HELP_STRING([--enable-sim-environment=environment],
-               [Specify mixed, user, virtual or operating environment])],
-[case "${enableval}" in
-  all | ALL)             sim_environment="ALL_ENVIRONMENT";;
-  user | USER)           sim_environment="USER_ENVIRONMENT";;
-  virtual | VIRTUAL)     sim_environment="VIRTUAL_ENVIRONMENT";;
-  operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
-  *)   AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-environment]);;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_ENVIRONMENT], [$sim_environment], [Sim default environment])
-AC_MSG_RESULT($sim_environment)
-])
-
-
-dnl Specify the alignment restrictions of the target architecture.
-dnl Without this option all possible alignment restrictions are accommodated.
-dnl arg[1] is hardwired target alignment
-dnl arg[2] is default target alignment
-AC_DEFUN([SIM_AC_OPTION_ALIGNMENT],
-wire_alignment="[$1]"
-default_alignment="[$2]"
-[
-AC_ARG_ENABLE(sim-alignment,
-[AS_HELP_STRING([--enable-sim-alignment=align],
-               [Specify strict, nonstrict or forced alignment of memory accesses])],
-[case "${enableval}" in
-  strict | STRICT)       sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";;
-  nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";;
-  forced | FORCED)       sim_alignment="-DWITH_ALIGNMENT=FORCED_ALIGNMENT";;
-  yes) if test x"$wire_alignment" != x; then
-        sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
-       else
-         if test x"$default_alignment" != x; then
-           sim_alignment="-DWITH_ALIGNMENT=${default_alignment}"
-         else
-          echo "No hard-wired alignment for target $target" 1>&6
-          sim_alignment="-DWITH_ALIGNMENT=0"
-         fi
-       fi;;
-  no)  if test x"$default_alignment" != x; then
-        sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
-       else
-         if test x"$wire_alignment" != x; then
-          sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${wire_alignment}"
-         else
-           echo "No default alignment for target $target" 1>&6
-           sim_alignment="-DWITH_DEFAULT_ALIGNMENT=0"
-         fi
-       fi;;
-  *)   AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-alignment"); sim_alignment="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then
-  echo "Setting alignment flags = $sim_alignment" 6>&1
-fi],
-[if test x"$default_alignment" != x; then
-  sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
-else
-  if test x"$wire_alignment" != x; then
-    sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
-  else
-    sim_alignment=
-  fi
-fi])dnl
-])dnl
-AC_SUBST(sim_alignment)
-
-
-dnl Conditionally compile in assertion statements.
-AC_DEFUN([SIM_AC_OPTION_ASSERT],
-[
-AC_MSG_CHECKING([whether to enable sim asserts])
-sim_assert="1"
-AC_ARG_ENABLE(sim-assert,
-[AS_HELP_STRING([--enable-sim-assert],
-               [Specify whether to perform random assertions])],
-[case "${enableval}" in
-  yes) sim_assert="1";;
-  no)  sim_assert="0";;
-  *)   AC_MSG_ERROR([--enable-sim-assert does not take a value]);;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings])
-AC_MSG_RESULT($sim_assert)
-])
-
-
-
-dnl --enable-sim-bitsize is for developers of the simulator
-dnl It specifies the number of BITS in the target.
-dnl arg[1] is the number of bits in a word
-dnl arg[2] is the number assigned to the most significant bit
-dnl arg[3] is the number of bits in an address
-dnl arg[4] is the number of bits in an OpenFirmware cell.
-dnl FIXME: this information should be obtained from bfd/archure
-AC_DEFUN([SIM_AC_OPTION_BITSIZE],
-wire_word_bitsize="[$1]"
-wire_word_msb="[$2]"
-wire_address_bitsize="[$3]"
-wire_cell_bitsize="[$4]"
-[AC_ARG_ENABLE(sim-bitsize,
-[AS_HELP_STRING([--enable-sim-bitsize=N], [Specify target bitsize (32 or 64)])],
-[sim_bitsize=
-case "${enableval}" in
-  64,63 | 64,63,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63";;
-  32,31 | 32,31,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31";;
-  64,0 | 64,0,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0";;
-  32,0 | 64,0,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0";;
-  32) if test x"$wire_word_msb" != x -a x"$wire_word_msb" != x0; then
-        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31"
-      else
-        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0"
-      fi ;;
-  64) if test x"$wire_word_msb" != x -a x"$wire_word_msb" != x0; then
-        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63"
-      else
-        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=0"
-      fi ;;
-  *)  AC_MSG_ERROR("--enable-sim-bitsize was given $enableval.  Expected 32 or 64") ;;
-esac
-# address bitsize
-tmp=`echo "${enableval}" | sed -e "s/^[[0-9]]*,*[[0-9]]*,*//"`
-case x"${tmp}" in
-  x ) ;;
-  x32 | x32,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_ADDRESS_BITSIZE=32" ;;
-  x64 | x64,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_ADDRESS_BITSIZE=64" ;;
-  * ) AC_MSG_ERROR("--enable-sim-bitsize was given address size $enableval.  Expected 32 or 64") ;;
-esac
-# cell bitsize
-tmp=`echo "${enableval}" | sed -e "s/^[[0-9]]*,*[[0-9*]]*,*[[0-9]]*,*//"`
-case x"${tmp}" in
-  x ) ;;
-  x32 | x32,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_CELL_BITSIZE=32" ;;
-  x64 | x64,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_CELL_BITSIZE=64" ;;
-  * ) AC_MSG_ERROR("--enable-sim-bitsize was given cell size $enableval.  Expected 32 or 64") ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bitsize" != x""; then
-  echo "Setting bitsize flags = $sim_bitsize" 6>&1
-fi],
-[sim_bitsize=""
-if test x"$wire_word_bitsize" != x; then
-  sim_bitsize="$sim_bitsize -DWITH_TARGET_WORD_BITSIZE=$wire_word_bitsize"
-fi
-if test x"$wire_word_msb" != x; then
-  sim_bitsize="$sim_bitsize -DWITH_TARGET_WORD_MSB=$wire_word_msb"
-fi
-if test x"$wire_address_bitsize" != x; then
-  sim_bitsize="$sim_bitsize -DWITH_TARGET_ADDRESS_BITSIZE=$wire_address_bitsize"
-fi
-if test x"$wire_cell_bitsize" != x; then
-  sim_bitsize="$sim_bitsize -DWITH_TARGET_CELL_BITSIZE=$wire_cell_bitsize"
-fi])dnl
-])
-AC_SUBST(sim_bitsize)
-
-
-
-dnl --enable-sim-endian={yes,no,big,little} is for simulators
-dnl that support both big and little endian targets.
-dnl arg[1] is hardwired target endianness.
-dnl arg[2] is default target endianness.
-AC_DEFUN([SIM_AC_OPTION_ENDIAN],
-[
-wire_endian="[$1]"
-default_endian="[$2]"
-AC_ARG_ENABLE(sim-endian,
-[AS_HELP_STRING([--enable-sim-endian=endian],
-               [Specify target byte endian orientation])],
-[case "${enableval}" in
-  b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_BIG";;
-  l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE";;
-  yes)  if test x"$wire_endian" != x; then
-          sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
-        else
-         if test x"$default_endian" != x; then
-            sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
-          else
-            echo "No hard-wired endian for target $target" 1>&6
-            sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
-          fi
-        fi;;
-  no)   if test x"$default_endian" != x; then
-          sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
-        else
-          if test x"$wire_endian" != x; then
-            sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
-          else
-            echo "No default endian for target $target" 1>&6
-            sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
-          fi
-        fi;;
-  *)    AC_MSG_ERROR("Unknown value $enableval for --enable-sim-endian"); sim_endian="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then
-  echo "Setting endian flags = $sim_endian" 6>&1
-fi],
-[if test x"$default_endian" != x; then
-  sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
-else
-  if test x"$wire_endian" != x; then
-    sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
-  else
-    sim_endian=
-  fi
-fi])dnl
-])
-AC_SUBST(sim_endian)
-
-
-dnl --enable-sim-float is for developers of the simulator
-dnl It specifies the presence of hardware floating point
-dnl And optionally the bitsize of the floating point register.
-dnl arg[1] specifies the presence (or absence) of floating point hardware
-dnl arg[2] specifies the number of bits in a floating point register
-AC_DEFUN([SIM_AC_OPTION_FLOAT],
-[
-default_sim_float="[$1]"
-default_sim_float_bitsize="[$2]"
-AC_ARG_ENABLE(sim-float,
-[AS_HELP_STRING([--enable-sim-float],
-               [Specify that the target processor has floating point hardware])],
-[case "${enableval}" in
-  yes | hard)  sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT";;
-  no | soft)   sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";;
-  32)           sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=32";;
-  64)           sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=64";;
-  *)           AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-float"); sim_float="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_float" != x""; then
-  echo "Setting float flags = $sim_float" 6>&1
-fi],[
-sim_float=
-if test x"${default_sim_float}" != x""; then
-  sim_float="-DWITH_FLOATING_POINT=${default_sim_float}"
-fi
-if test x"${default_sim_float_bitsize}" != x""; then
-  sim_float="$sim_float -DWITH_TARGET_FLOATING_POINT_BITSIZE=${default_sim_float_bitsize}"
-fi
-])dnl
-])
-AC_SUBST(sim_float)
-
-
-dnl The argument is the default cache size if none is specified.
-AC_DEFUN([SIM_AC_OPTION_SCACHE],
-[
-default_sim_scache="ifelse([$1],,0,[$1])"
-AC_ARG_ENABLE(sim-scache,
-[AS_HELP_STRING([--enable-sim-scache=size],
-               [Specify simulator execution cache size])],
-[case "${enableval}" in
-  yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";;
-  no)  sim_scache="-DWITH_SCACHE=0" ;;
-  [[0-9]]*) sim_scache="-DWITH_SCACHE=${enableval}";;
-  *)   AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache");
-       sim_scache="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then
-  echo "Setting scache size = $sim_scache" 6>&1
-fi],[sim_scache="-DWITH_SCACHE=${default_sim_scache}"])
-])
-AC_SUBST(sim_scache)
-
-
-dnl The argument is the default model if none is specified.
-AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL],
-[
-default_sim_default_model="ifelse([$1],,0,[$1])"
-AC_ARG_ENABLE(sim-default-model,
-[AS_HELP_STRING([--enable-sim-default-model=model],
-               [Specify default model to simulate])],
-[case "${enableval}" in
-  yes|no) AC_MSG_ERROR("Missing argument to --enable-sim-default-model");;
-  *)   sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
-  echo "Setting default model = $sim_default_model" 6>&1
-fi],[sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"])
-])
-AC_SUBST(sim_default_model)
-
-
-dnl --enable-sim-hardware is for users of the simulator
-dnl arg[1] Enable sim-hw by default? ("yes" or "no")
-dnl arg[2] is a space separated list of devices that override the defaults
-dnl arg[3] is a space separated list of extra target specific devices.
-AC_DEFUN([SIM_AC_OPTION_HARDWARE],
-[
-if test "[$2]"; then
-  hardware="[$2]"
-else
-  hardware="cfi core pal glue"
-fi
-hardware="$hardware [$3]"
-
-sim_hw_cflags="-DWITH_HW=1"
-sim_hw="$hardware"
-sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`"
-
-AC_ARG_ENABLE(sim-hardware,
-  [AS_HELP_STRING([--enable-sim-hardware=LIST],
-                  [Specify the hardware to be included in the build.])],
-  ,[enable_sim_hardware="[$1]"])
-case ${enable_sim_hardware} in
-  yes|no) ;;
-  ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
-  *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
-  *)  hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
-esac
-
-if test "$enable_sim_hardware" = no; then
-  sim_hw_objs=
-  sim_hw_cflags="-DWITH_HW=0"
-  sim_hw=
-else
-  sim_hw_cflags="-DWITH_HW=1"
-  # remove duplicates
-  sim_hw=""
-  sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
-  for i in $hardware ; do
-    case " $sim_hw " in
-      *" $i "*) ;;
-      *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
-    esac
-  done
-  # mingw does not support sockser
-  case ${host} in
-    *mingw*) ;;
-    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
-       # that you instatiate.  Instead, other code will call into it directly.
-       # At some point, we should convert it over.
-       sim_hw_objs="$sim_hw_objs dv-sockser.o"
-       AC_DEFINE_UNQUOTED(
-         [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
-       ;;
-  esac
-  if test x"$silent" != x"yes"; then
-    echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
-  fi
-  dnl Some devices require extra libraries.
-  case " $hardware " in
-    *" cfi "*) AC_CHECK_LIB(m, log2);;
-  esac
-fi
-])
-AC_SUBST(sim_hw_cflags)
-AC_SUBST(sim_hw_objs)
-AC_SUBST(sim_hw)
-
-
-dnl --enable-sim-inline is for users that wish to ramp up the simulator's
-dnl performance by inlining functions.
-dnl Default sims to no inlining.
-AC_DEFUN([SIM_AC_OPTION_INLINE],
-[
-sim_inline="-DDEFAULT_INLINE=m4_ifblank([$1],[0],[$1])"
-AC_ARG_ENABLE(sim-inline,
-[AS_HELP_STRING([--enable-sim-inline=inlines],
-               [Specify which functions should be inlined])],
-[sim_inline=""
-case "$enableval" in
-  no)          sim_inline="-DDEFAULT_INLINE=0";;
-  0)           sim_inline="-DDEFAULT_INLINE=0";;
-  yes | 2)     sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
-  1)           sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
-  *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-       new_flag=""
-       case "$x" in
-        *_INLINE=*)    new_flag="-D$x";;
-        *=*)           new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
-        *_INLINE)      new_flag="-D$x=ALL_C_INLINE";;
-        *)             new_flag="-D$x""_INLINE=ALL_C_INLINE";;
-       esac
-       if test x"$sim_inline" = x""; then
-        sim_inline="$new_flag"
-       else
-        sim_inline="$sim_inline $new_flag"
-       fi
-     done;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
-  echo "Setting inline flags = $sim_inline" 6>&1
-fi])dnl
-])
-AC_SUBST(sim_inline)
-
-
-AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS],
-[
-default_sim_reserved_bits="ifelse([$1],,1,[$1])"
-AC_ARG_ENABLE(sim-reserved-bits,
-[AS_HELP_STRING([--enable-sim-reserved-bits],
-               [Specify whether to check reserved bits in instruction])],
-[case "${enableval}" in
-  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)   AC_MSG_ERROR("--enable-sim-reserved-bits does not take a value"); sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi],[sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"])dnl
-])
-AC_SUBST(sim_reserved_bits)
-
-
-AC_DEFUN([SIM_AC_OPTION_SMP],
-[
-AC_MSG_CHECKING([number of sim cpus to support])
-default_sim_smp="ifelse([$1],,5,[$1])"
-sim_smp="$default_sim_smp""
-AC_ARG_ENABLE(sim-smp,
-[AS_HELP_STRING([--enable-sim-smp=n],
-               [Specify number of processors to configure for (default ${default_sim_smp})])],
-[case "${enableval}" in
-  yes) sim_smp="5";;
-  no)  sim_smp="0";;
-  *)   sim_smp="$enableval";;
-esac])dnl
-sim_igen_smp="-N ${sim_smp}"
-AC_DEFINE_UNQUOTED([WITH_SMP], [$sim_smp], [Sim SMP settings])
-AC_MSG_RESULT($sim_smp)
-])
-
-
-AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN],
-[
-AC_MSG_CHECKING([for xor endian support])
-default_sim_xor_endian="ifelse([$1],,8,[$1])"
-sim_xor_endian="$default_sim_xor_endian"
-AC_ARG_ENABLE(sim-xor-endian,
-[AS_HELP_STRING([--enable-sim-xor-endian=n],
-               [Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian})])],
-[case "${enableval}" in
-  yes) sim_xor_endian="8";;
-  no)  sim_xor_endian="0";;
-  *)   sim_xor_endian="$enableval";;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_XOR_ENDIAN], [$sim_xor_endian], [Sim XOR endian settings])
-AC_MSG_RESULT($sim_smp)
-])
-
-
-dnl --enable-build-warnings is for developers of the simulator.
-dnl it enables extra GCC specific warnings.
-dnl arg[1] Enable -Werror by default? ("yes" or "no")
-AC_DEFUN([SIM_AC_OPTION_WARNINGS],
-[
-AC_ARG_ENABLE(werror,
-  AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
-  [case "${enableval}" in
-     yes | y) ERROR_ON_WARNING="yes" ;;
-     no | n)  ERROR_ON_WARNING="no" ;;
-     *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
-   esac])
-
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-    ERROR_ON_WARNING=yes
-fi
-
-WERROR_CFLAGS=""
-m4_if(m4_default([$1], [yes]), [yes], [dnl
-  if test "${ERROR_ON_WARNING}" = yes ; then
-    WERROR_CFLAGS="-Werror"
-  fi
-])dnl
-
-build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
--Wpointer-sign \
--Wno-unused -Wunused-value -Wunused-function \
--Wno-switch -Wno-char-subscripts -Wmissing-prototypes
--Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \
--Wold-style-declaration -Wold-style-definition"
-
-# Enable -Wno-format by default when using gcc on mingw since many
-# GCC versions complain about %I64.
-case "${host}" in
-  *-*-mingw32*) build_warnings="$build_warnings -Wno-format" ;;
-  *) build_warnings="$build_warnings -Wformat-nonliteral" ;;
-esac
-
-AC_ARG_ENABLE(build-warnings,
-AS_HELP_STRING([--enable-build-warnings], [enable build-time compiler warnings if gcc is used]),
-[case "${enableval}" in
-  yes) ;;
-  no)  build_warnings="-w";;
-  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${build_warnings} ${t}";;
-  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${t} ${build_warnings}";;
-  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-esac
-if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
-  echo "Setting compiler warning flags = $build_warnings" 6>&1
-fi])dnl
-AC_ARG_ENABLE(sim-build-warnings,
-AS_HELP_STRING([--enable-sim-build-warnings], [enable SIM specific build-time compiler warnings if gcc is used]),
-[case "${enableval}" in
-  yes) ;;
-  no)  build_warnings="-w";;
-  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${build_warnings} ${t}";;
-  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-        build_warnings="${t} ${build_warnings}";;
-  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-esac
-if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
-  echo "Setting GDB specific compiler warning flags = $build_warnings" 6>&1
-fi])dnl
-WARN_CFLAGS=""
-if test "x${build_warnings}" != x -a "x$GCC" = xyes
-then
-    AC_MSG_CHECKING(compiler warning flags)
-    # Separate out the -Werror flag as some files just cannot be
-    # compiled with it enabled.
-    for w in ${build_warnings}; do
-       case $w in
-       -Werr*) WERROR_CFLAGS=-Werror ;;
-       *) # Check that GCC accepts it
-           saved_CFLAGS="$CFLAGS"
-           CFLAGS="$CFLAGS $w"
-           AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",)
-           CFLAGS="$saved_CFLAGS"
-       esac
-    done
-    AC_MSG_RESULT(${WARN_CFLAGS} ${WERROR_CFLAGS})
-fi
-])
-AC_SUBST(WARN_CFLAGS)
-AC_SUBST(WERROR_CFLAGS)
-
-
-dnl Generate the Makefile in a target specific directory.
-dnl Substitutions aren't performed on the file in AC_SUBST_FILE,
-dnl so this is a cover macro to tuck the details away of how we cope.
-dnl We cope by having autoconf generate two files and then merge them into
-dnl one afterwards.  The two pieces of the common fragment are inserted into
-dnl the target's fragment at the appropriate points.
-
-AC_DEFUN([SIM_AC_OUTPUT],
-[dnl
-AC_REQUIRE([SIM_AC_OPTION_WARNINGS])dnl
-
-dnl Make @cgen_breaks@ non-null only if the sim uses CGEN.
-cgen_breaks=""
-if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-cgen_breaks="break cgen_rtx_error";
-fi
-AC_SUBST(cgen_breaks)
-AC_CONFIG_FILES(Makefile.sim:Makefile.in)
-AC_CONFIG_FILES(Make-common.sim:../common/Make-common.in)
-AC_CONFIG_FILES(.gdbinit:../common/gdbinit.in)
-AC_CONFIG_COMMANDS([Makefile],
-[echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
- rm -f Makesim1.tmp Makesim2.tmp Makefile
- sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
- sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
- sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
-       -e '/^## COMMON_POST_/ r Makesim2.tmp' \
-       <Makefile.sim >Makefile
- rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
-])
-AC_CONFIG_COMMANDS([stamp-h], [echo > stamp-h])
-AC_OUTPUT
-])
-
-dnl --enable-cgen-maint support
-AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT],
-[
-cgen_maint=no
-dnl Default is to use one in build tree.
-cgen=guile
-cgendir='$(srcdir)/../../cgen'
-dnl Having --enable-maintainer-mode take arguments is another way to go.
-dnl ??? One can argue --with is more appropriate if one wants to specify
-dnl a directory name, but what we're doing here is an enable/disable kind
-dnl of thing and specifying both --enable and --with is klunky.
-dnl If you reeely want this to be --with, go ahead and change it.
-AC_ARG_ENABLE(cgen-maint,
-[AS_HELP_STRING([--enable-cgen-maint[=DIR]], [build cgen generated files])],
-[case "${enableval}" in
-  yes) cgen_maint=yes ;;
-  no)  cgen_maint=no ;;
-  *)
-       # Argument is a directory where cgen can be found.  In some
-       # future world cgen could be installable, but right now this
-       # is not the case.  Instead we assume the directory is a path
-       # to the cgen source tree.
-       cgen_maint=yes
-        if test -r ${enableval}/iformat.scm; then
-          # This looks like a cgen source tree.
-         cgendir=${enableval}
-        else
-         AC_MSG_ERROR(${enableval} doesn't look like a cgen source tree)
-        fi
-       ;;
-esac])dnl
-dnl AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} != xno)
-if test x${cgen_maint} != xno ; then
-  CGEN_MAINT=''
-else
-  CGEN_MAINT='#'
-fi
-AC_SUBST(CGEN_MAINT)
-AC_SUBST(cgendir)
-AC_SUBST(cgen)
-])
index b26bdfae8ae17d4f5f6d4597e163e7f59d5ae56c..f4a342d980ea6582081c1cb433d88407ff317635 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index f7885ce6257e2b55380a7c2735b3329a463d1e06..31a7b6bb34a69352178e494db341d5bc81136947 100755 (executable)
@@ -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="LITTLE"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -11996,6 +11995,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
index 791fa930d836147e321a9bc0b72fd97e01e4aa2c..582779750d875427bf0970fe69a6ac46fc975d8d 100644 (file)
@@ -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
 
index 5e833557649036bad10d26880dc7582b78b80be7..6613c3cf5f60c485c311721ca5b3a95ffba9182c 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..155b726707cb97e22ad4c289e68b9c148a7a31f8 100644 (file)
@@ -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])
index 3c0330baa82a4370a4c55622ba9413a0499a21ce..82d65be64d71c6a570596f71c2c5e8c265e40f4e 100755 (executable)
@@ -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
index 5bf23136b6abebcd980c12b94837f81c1173e315..1eee81762ad9d8e6ee7e47e5456b23ad1af7fb14 100644 (file)
@@ -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
 
index 6ff8d7e8366f188a51e9944f55bdfa007f41de15..e85d51b1a516f87af3fbb915370856172f51cc88 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 7ed827d926c62d09af20e158ed527238bda988eb..ce4eab5bccfe46c9e90c863797e2ecc8ac1d1f52 100755 (executable)
@@ -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.
@@ -11996,6 +11995,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
index a22577f76170a64f25a375dbc17d2a06169721c5..4417ba4e561edc6fff82c6621cbcb276cba8d79f 100644 (file)
@@ -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
 
index aa58e9083008ea9e62aa18b4b98cc319bd2671ce..b518ae5fe07a6e58b7e5f966c1649e4cb47b3d26 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..a29db710788c76d9d7f2906511f83ac430fd17c9 100644 (file)
@@ -98,6 +98,12 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +116,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 3f88b355ce5e9f2ddec22c040d06770921dc34eb..75d43ac04b2cbf7687eb9c3f0d0ba026f4babb09 100755 (executable)
@@ -631,6 +631,16 @@ 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_endian
+sim_bitsize
+sim_alignment
 cgen_breaks
 READLINE
 TERMCAP
@@ -749,17 +759,7 @@ 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'
+sim_inline'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -11785,7 +11785,6 @@ _ACEOF
 
 
 
-
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; case "${enableval}" in
@@ -12037,6 +12036,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
index f864e970774216cba202c1c88dfdcb09f5f62fea..0edd6e3e67f276ed4c4d5ced546a90cbbff1eaf6 100644 (file)
@@ -15,7 +15,7 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 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
 SIM_AC_OPTION_WARNINGS(no)
index 63e358f84d7f8516c568526fe329343b296eba24..b7befea03aba30a4f22b514c7b91feafc07e5e93 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..155b726707cb97e22ad4c289e68b9c148a7a31f8 100644 (file)
@@ -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])
index 406e7683ff27ee364bf21af7c578b226641834d4..983b16f2db594f1221619346c9f21d8787dc7717 100755 (executable)
@@ -631,6 +631,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_float
+sim_bitsize
 cgen_breaks
 sim_trapdump
 cgen
@@ -751,16 +754,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='
@@ -11808,7 +11808,6 @@ _ACEOF
 
 
 
-
 wire_endian="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12207,6 +12206,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
index 55b300e7393f584f0eb84b6b3bdf0e88cdbeab58..b4f5953051f00d7a7cfa04417b44d72bb084a491 100644 (file)
@@ -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
 
index 88dbdd477eb9c524f6aac12a704d43bb80dc92df..69baf195261baf14fb697b132a1efb942c72e1c5 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 530f2d7fd62d46f8d6e8a0aef9e932e019b27194..2d0b715883b65714a8a56105c121a430611bc048 100755 (executable)
@@ -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="LITTLE"
 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
index 8ace4ddf39d5d8c39b359dc71d5bf5f5fe48ab74..658a0a459d0170eccbcfa1961a5be54eb29dc2b8 100644 (file)
@@ -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
 
index 9958f7aa07aaa6598360703507dbd45097dcf11d..f0fb782ae4509ce9cd8cbaa601bbdf2ac5df1302 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index b9f83014c48772696f2d9a257489af4df9cf4947..6622a8c372ea1b080b66ef312f05556eae3090f3 100755 (executable)
@@ -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="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12009,6 +12008,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
index ef6257c97ab9aed867ba79441c5abe38e176206c..177f7dee465bbb412e33511f1522f6ea07cf5ca9 100644 (file)
@@ -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
 
index 54ffcafa46d05202e1d52a5ffdb23fc2324181d4..5489e70baa3c088e22e5eeb3422db40c703c7d18 100644 (file)
@@ -1,3 +1,8 @@
+2021-02-21  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.
+       * configure: Regenerate.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Replace sinclude with AC_CONFIG_MACRO_DIRS.
index 0b14176017e841218813e99a636198a3d3fe04c4..38b8b8b4db34c3db39dddb00f517197e7d7aed4c 100755 (executable)
@@ -692,18 +692,7 @@ PACKAGE_NAME
 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'
+WARN_CFLAGS'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -2067,9 +2056,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
-
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
index 5763b8407bf32b03213b33c1ea750c9029abb1ff..f93ca4ba469b0cffb2d117a50bd50b50f595a277 100644 (file)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(table.h)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 AC_PROG_INSTALL
 AC_PROG_CC
index c9cf7d19cdd71697dac3879c4016e35610bdf18b..569226d609fe3cef417fc13ea1053d1220547da0 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..155b726707cb97e22ad4c289e68b9c148a7a31f8 100644 (file)
@@ -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])
index bf7d321d4536e5f50ebf52d6a471c139afd2488b..213800d6060ed5aa2a032f23f5be53156002f8ba 100755 (executable)
@@ -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='
@@ -11805,7 +11805,6 @@ _ACEOF
 
 
 
-
 wire_endian="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12186,6 +12185,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
index d8db34ee5adb92ca739e828e8b93ebe0bb6f63ba..1a5dcfb276a53b37e7c84da767d80b2fef8e713c 100644 (file)
@@ -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
 
index 7536b9592c0eeb7f2214426358629efa15d6f00a..3abf22cada9b9af24d532c49f7e51f53ca397ed5 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..155b726707cb97e22ad4c289e68b9c148a7a31f8 100644 (file)
@@ -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])
index 5405b97030df3dec06cb6de22d26d93b0f90f57d..ccda45d60a12d29631a470b0619f0bf506232d75 100755 (executable)
@@ -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='
@@ -11805,7 +11805,6 @@ _ACEOF
 
 
 
-
 wire_endian="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12185,6 +12184,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
index d62f5160f6428ce090f9ac77ee58ca21e4d59c75..83ed5034580bb737a392798d43f7b68e8ec84d15 100644 (file)
@@ -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
 
index 60cf51f973e3f3f1f0069ad7cb663a6058380bea..1f2d7e08ce704e8515ba9680793a5c5ab192b8f1 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..a29db710788c76d9d7f2906511f83ac430fd17c9 100644 (file)
@@ -98,6 +98,12 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +116,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 91ae88e9c2e6e4e83a973944bf94ef5ce9a7a76b..6e49badf67dba7e69eb77cbdd82dd619c7bb4821 100755 (executable)
@@ -631,6 +631,16 @@ 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_endian
+sim_bitsize
+sim_alignment
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,17 +757,7 @@ 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'
+sim_inline'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -11784,7 +11784,6 @@ _ACEOF
 
 
 
-
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; case "${enableval}" in
@@ -11912,6 +11911,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
index beaf2059916a64ecdcfea733d40bae1244d37451..789bce45a02965d3a7cb9f8cef50ea9c55351ace 100644 (file)
@@ -19,7 +19,7 @@ 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
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
index b14664cdf518dbcf332612b6f05e7dffc02cc1fe..fe214494aa897e64980e1f2194d726bb417bf93f 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..155b726707cb97e22ad4c289e68b9c148a7a31f8 100644 (file)
@@ -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])
index 851c0f87231d6d7da01c1a37b595b774bd78e60a..ce3e6a0e19f7a4266937cbae2d1304316e6d975d 100755 (executable)
@@ -631,6 +631,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_float
+sim_bitsize
 cgen_breaks
 sim_extra_cflags
 traps_obj
@@ -752,16 +755,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='
@@ -11807,7 +11807,6 @@ _ACEOF
 
 
 
-
 wire_endian="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12201,6 +12200,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
index f27135db68fb82956d36a467482df0681c1cc3c8..2fd7f7265b0fbfe66bf1a23d29e1ae1cbd290f8a 100644 (file)
@@ -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
 
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
new file mode 100644 (file)
index 0000000..bfbde3f
--- /dev/null
@@ -0,0 +1,260 @@
+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],
+[
+AC_REQUIRE([AC_PROG_CC])
+AC_CONFIG_HEADERS([config.h:config.in])
+AC_CANONICAL_SYSTEM
+AC_USE_SYSTEM_EXTENSIONS
+AC_C_BIGENDIAN
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+
+AC_SUBST(CFLAGS)
+AR=${AR-ar}
+AC_SUBST(AR)
+AC_PROG_RANLIB
+
+# Require C11 or newer.  Autoconf-2.70 provides ac_cv_prog_cc_c11 when using
+# AC_PROG_CC, but we're still using Autoconf-2.69, and the newest it understands
+# is C99.  So handle it ourselves.
+m4_version_prereq([2.70], [AC_MSG_ERROR([clean this up!])], [:])
+C_DIALECT=
+AC_MSG_CHECKING([whether C11 is supported by default])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "C11 support not found"
+#endif
+])], [AC_MSG_RESULT([yes])], [
+  AC_MSG_RESULT([no])
+  AC_MSG_CHECKING([for -std=c11 support])
+  ac_save_CC="$CC"
+  CC="$CC -std=c11"
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "C11 support not found"
+#endif
+])], [
+  AC_MSG_RESULT([yes])
+  CC="$ac_save_CC"
+  C_DIALECT="-std=c11"
+], [AC_MSG_ERROR([C11 is required])])])
+AC_SUBST(C_DIALECT)
+
+# Some of the common include files depend on bfd.h, and bfd.h checks
+# that config.h is included first by testing that the PACKAGE macro
+# is defined.
+PACKAGE=sim
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
+AC_SUBST(PACKAGE)
+
+# Dependency checking.
+ZW_CREATE_DEPDIR
+ZW_PROG_COMPILER_DEPENDENCIES([CC])
+
+# Check for the 'make' the user wants to use.
+AC_CHECK_PROGS(MAKE, make)
+MAKE_IS_GNU=
+case "`$MAKE --version 2>&1 | sed 1q`" in
+  *GNU*)
+    MAKE_IS_GNU=yes
+    ;;
+esac
+AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes)
+
+dnl We don't use gettext, but bfd does.  So we do the appropriate checks
+dnl to see if there are intl libraries we should link against.
+ALL_LINGUAS=
+ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
+
+# Check for common headers.
+# NB: You can assume C11 headers exist.
+AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(sys/time.h sys/times.h sys/resource.h sys/mman.h)
+AC_CHECK_HEADERS(fcntl.h fpu_control.h)
+AC_CHECK_HEADERS(dlfcn.h sys/stat.h)
+AC_CHECK_FUNCS(getrusage time sigaction __setfpucw)
+AC_CHECK_FUNCS(mmap munmap lstat truncate ftruncate posix_fallocate)
+AC_CHECK_MEMBERS([[struct stat.st_dev], [struct stat.st_ino],
+[struct stat.st_mode], [struct stat.st_nlink], [struct stat.st_uid],
+[struct stat.st_gid], [struct stat.st_rdev], [struct stat.st_size],
+[struct stat.st_blksize], [struct stat.st_blocks], [struct stat.st_atime],
+[struct stat.st_mtime], [struct stat.st_ctime]], [], [],
+[[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif]])
+AC_CHECK_TYPES(socklen_t, [], [],
+[#include <sys/types.h>
+#include <sys/socket.h>
+])
+
+# Check for socket libraries
+AC_CHECK_LIB(socket, bind)
+AC_CHECK_LIB(nsl, gethostbyname)
+
+# BFD conditionally uses zlib, so we must link it in if libbfd does, by
+# using the same condition.
+AM_ZLIB
+
+# BFD uses libdl when when plugins enabled.
+AC_PLUGINS
+AM_CONDITIONAL(PLUGINS, test "$plugins" = yes)
+LT_INIT([dlopen])
+AC_SUBST(lt_cv_dlopen_libs)
+
+dnl Standard (and optional) simulator options.
+dnl Eventually all simulators will support these.
+dnl Do not add any here that cannot be supported by all simulators.
+dnl Do not add similar but different options to a particular simulator,
+dnl all shall eventually behave the same way.
+
+
+dnl We don't use automake, but we still want to support
+dnl --enable-maintainer-mode.
+AM_MAINTAINER_MODE
+
+
+dnl --enable-sim-debug is for developers of the simulator
+dnl the allowable values are work-in-progress
+AC_MSG_CHECKING([for sim debug setting])
+sim_debug="0"
+AC_ARG_ENABLE(sim-debug,
+[AS_HELP_STRING([--enable-sim-debug=opts],
+               [Enable debugging flags (for developers of the sim itself)])],
+[case "${enableval}" in
+  yes) sim_debug="7";;
+  no)  sim_debug="0";;
+  *)   sim_debug="($enableval)";;
+esac])dnl
+if test "$sim_debug" != "0"; then
+  AC_DEFINE_UNQUOTED([DEBUG], [$sim_debug], [Sim debug setting])
+fi
+AC_DEFINE_UNQUOTED([WITH_DEBUG], [$sim_debug], [Sim debug setting])
+AC_MSG_RESULT($sim_debug)
+
+
+dnl --enable-sim-stdio is for users of the simulator
+dnl It determines if IO from the program is routed through STDIO (buffered)
+AC_MSG_CHECKING([for sim stdio debug behavior])
+sim_stdio="0"
+AC_ARG_ENABLE(sim-stdio,
+[AS_HELP_STRING([--enable-sim-stdio],
+               [Specify whether to use stdio for console input/output])],
+[case "${enableval}" in
+  yes) sim_stdio="DO_USE_STDIO";;
+  no)  sim_stdio="DONT_USE_STDIO";;
+  *)   AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-stdio]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_STDIO], [$sim_stdio], [How to route I/O])
+AC_MSG_RESULT($sim_stdio)
+
+
+dnl --enable-sim-trace is for users of the simulator
+dnl The argument is either a bitmask of things to enable [exactly what is
+dnl up to the simulator], or is a comma separated list of names of tracing
+dnl elements to enable.  The latter is only supported on simulators that
+dnl use WITH_TRACE.  Default to all tracing but internal debug.
+AC_MSG_CHECKING([for sim trace settings])
+sim_trace="~TRACE_debug"
+AC_ARG_ENABLE(sim-trace,
+[AS_HELP_STRING([--enable-sim-trace=opts],
+               [Enable tracing of simulated programs])],
+[case "${enableval}" in
+  yes) sim_trace="-1";;
+  no)  sim_trace="0";;
+  [[-0-9]]*)
+       sim_trace="'(${enableval})'";;
+  [[[:lower:]]]*)
+       sim_trace=""
+       for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+         if test x"$sim_trace" = x; then
+           sim_trace="(TRACE_$x"
+         else
+           sim_trace="${sim_trace}|TRACE_$x"
+         fi
+       done
+       sim_trace="$sim_trace)" ;;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_TRACE], [$sim_trace], [Sim trace settings])
+AC_MSG_RESULT($sim_trace)
+
+
+dnl --enable-sim-profile
+dnl The argument is either a bitmask of things to enable [exactly what is
+dnl up to the simulator], or is a comma separated list of names of profiling
+dnl elements to enable.  The latter is only supported on simulators that
+dnl use WITH_PROFILE.
+AC_MSG_CHECKING([for sim profile settings])
+profile="1"
+sim_profile="-1"
+AC_ARG_ENABLE(sim-profile,
+[AS_HELP_STRING([--enable-sim-profile=opts], [Enable profiling flags])],
+[case "${enableval}" in
+  yes) profile="1" sim_profile="-1";;
+  no)  profile="0" sim_profile="0";;
+  [[-0-9]]*)
+       profile="(${enableval})" sim_profile="(${enableval})";;
+  [[a-z]]*)
+    profile="1"
+       sim_profile=""
+       for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+         if test x"$sim_profile" = x; then
+           sim_profile="(PROFILE_$x"
+         else
+           sim_profile="${sim_profile}|PROFILE_$x"
+         fi
+       done
+       sim_profile="$sim_profile)" ;;
+esac])dnl
+AC_DEFINE_UNQUOTED([PROFILE], [$profile], [Sim profile settings])
+AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings])
+AC_MSG_RESULT($sim_profile)
+
+
+SIM_AC_OPTION_ASSERT
+SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE
+
+ACX_PKGVERSION([SIM])
+ACX_BUGURL([https://www.gnu.org/software/gdb/bugs/])
+AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
+AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
+
+dnl Types used by common code
+AC_TYPE_SIGNAL
+
+dnl Detect exe extension
+AC_EXEEXT
+]) dnl End of SIM_AC_COMMON
diff --git a/sim/m4/sim_ac_option_alignment.m4 b/sim/m4/sim_ac_option_alignment.m4
new file mode 100644 (file)
index 0000000..dcfa479
--- /dev/null
@@ -0,0 +1,66 @@
+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 Specify the alignment restrictions of the target architecture.
+dnl Without this option all possible alignment restrictions are accommodated.
+dnl arg[1] is hardwired target alignment
+dnl arg[2] is default target alignment
+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT],
+wire_alignment="[$1]"
+default_alignment="[$2]"
+[
+AC_ARG_ENABLE(sim-alignment,
+[AS_HELP_STRING([--enable-sim-alignment=align],
+               [Specify strict, nonstrict or forced alignment of memory accesses])],
+[case "${enableval}" in
+  strict | STRICT)       sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";;
+  nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";;
+  forced | FORCED)       sim_alignment="-DWITH_ALIGNMENT=FORCED_ALIGNMENT";;
+  yes) if test x"$wire_alignment" != x; then
+        sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
+       else
+         if test x"$default_alignment" != x; then
+           sim_alignment="-DWITH_ALIGNMENT=${default_alignment}"
+         else
+          echo "No hard-wired alignment for target $target" 1>&6
+          sim_alignment="-DWITH_ALIGNMENT=0"
+         fi
+       fi;;
+  no)  if test x"$default_alignment" != x; then
+        sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
+       else
+         if test x"$wire_alignment" != x; then
+          sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${wire_alignment}"
+         else
+           echo "No default alignment for target $target" 1>&6
+           sim_alignment="-DWITH_DEFAULT_ALIGNMENT=0"
+         fi
+       fi;;
+  *)   AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-alignment"); sim_alignment="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then
+  echo "Setting alignment flags = $sim_alignment" 6>&1
+fi],
+[if test x"$default_alignment" != x; then
+  sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}"
+else
+  if test x"$wire_alignment" != x; then
+    sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}"
+  else
+    sim_alignment=
+  fi
+fi])dnl
+])dnl
+AC_SUBST(sim_alignment)
diff --git a/sim/m4/sim_ac_option_assert.m4 b/sim/m4/sim_ac_option_assert.m4
new file mode 100644 (file)
index 0000000..44304fc
--- /dev/null
@@ -0,0 +1,31 @@
+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 Conditionally compile in assertion statements.
+AC_DEFUN([SIM_AC_OPTION_ASSERT],
+[
+AC_MSG_CHECKING([whether to enable sim asserts])
+sim_assert="1"
+AC_ARG_ENABLE(sim-assert,
+[AS_HELP_STRING([--enable-sim-assert],
+               [Specify whether to perform random assertions])],
+[case "${enableval}" in
+  yes) sim_assert="1";;
+  no)  sim_assert="0";;
+  *)   AC_MSG_ERROR([--enable-sim-assert does not take a value]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings])
+AC_MSG_RESULT($sim_assert)
+])
diff --git a/sim/m4/sim_ac_option_bitsize.m4 b/sim/m4/sim_ac_option_bitsize.m4
new file mode 100644 (file)
index 0000000..f4fdefb
--- /dev/null
@@ -0,0 +1,81 @@
+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 --enable-sim-bitsize is for developers of the simulator
+dnl It specifies the number of BITS in the target.
+dnl arg[1] is the number of bits in a word
+dnl arg[2] is the number assigned to the most significant bit
+dnl arg[3] is the number of bits in an address
+dnl arg[4] is the number of bits in an OpenFirmware cell.
+dnl FIXME: this information should be obtained from bfd/archure
+AC_DEFUN([SIM_AC_OPTION_BITSIZE],
+wire_word_bitsize="[$1]"
+wire_word_msb="[$2]"
+wire_address_bitsize="[$3]"
+wire_cell_bitsize="[$4]"
+[AC_ARG_ENABLE(sim-bitsize,
+[AS_HELP_STRING([--enable-sim-bitsize=N], [Specify target bitsize (32 or 64)])],
+[sim_bitsize=
+case "${enableval}" in
+  64,63 | 64,63,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63";;
+  32,31 | 32,31,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31";;
+  64,0 | 64,0,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0";;
+  32,0 | 64,0,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0";;
+  32) if test x"$wire_word_msb" != x -a x"$wire_word_msb" != x0; then
+        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31"
+      else
+        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=0"
+      fi ;;
+  64) if test x"$wire_word_msb" != x -a x"$wire_word_msb" != x0; then
+        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63"
+      else
+        sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=0"
+      fi ;;
+  *)  AC_MSG_ERROR("--enable-sim-bitsize was given $enableval.  Expected 32 or 64") ;;
+esac
+# address bitsize
+tmp=`echo "${enableval}" | sed -e "s/^[[0-9]]*,*[[0-9]]*,*//"`
+case x"${tmp}" in
+  x ) ;;
+  x32 | x32,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_ADDRESS_BITSIZE=32" ;;
+  x64 | x64,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_ADDRESS_BITSIZE=64" ;;
+  * ) AC_MSG_ERROR("--enable-sim-bitsize was given address size $enableval.  Expected 32 or 64") ;;
+esac
+# cell bitsize
+tmp=`echo "${enableval}" | sed -e "s/^[[0-9]]*,*[[0-9*]]*,*[[0-9]]*,*//"`
+case x"${tmp}" in
+  x ) ;;
+  x32 | x32,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_CELL_BITSIZE=32" ;;
+  x64 | x64,* ) sim_bitsize="${sim_bitsize} -DWITH_TARGET_CELL_BITSIZE=64" ;;
+  * ) AC_MSG_ERROR("--enable-sim-bitsize was given cell size $enableval.  Expected 32 or 64") ;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_bitsize" != x""; then
+  echo "Setting bitsize flags = $sim_bitsize" 6>&1
+fi],
+[sim_bitsize=""
+if test x"$wire_word_bitsize" != x; then
+  sim_bitsize="$sim_bitsize -DWITH_TARGET_WORD_BITSIZE=$wire_word_bitsize"
+fi
+if test x"$wire_word_msb" != x; then
+  sim_bitsize="$sim_bitsize -DWITH_TARGET_WORD_MSB=$wire_word_msb"
+fi
+if test x"$wire_address_bitsize" != x; then
+  sim_bitsize="$sim_bitsize -DWITH_TARGET_ADDRESS_BITSIZE=$wire_address_bitsize"
+fi
+if test x"$wire_cell_bitsize" != x; then
+  sim_bitsize="$sim_bitsize -DWITH_TARGET_CELL_BITSIZE=$wire_cell_bitsize"
+fi])dnl
+])
+AC_SUBST(sim_bitsize)
diff --git a/sim/m4/sim_ac_option_cgen_maint.m4 b/sim/m4/sim_ac_option_cgen_maint.m4
new file mode 100644 (file)
index 0000000..00d54ff
--- /dev/null
@@ -0,0 +1,56 @@
+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 --enable-cgen-maint support
+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT],
+[
+cgen_maint=no
+dnl Default is to use one in build tree.
+cgen=guile
+cgendir='$(srcdir)/../../cgen'
+dnl Having --enable-maintainer-mode take arguments is another way to go.
+dnl ??? One can argue --with is more appropriate if one wants to specify
+dnl a directory name, but what we're doing here is an enable/disable kind
+dnl of thing and specifying both --enable and --with is klunky.
+dnl If you reeely want this to be --with, go ahead and change it.
+AC_ARG_ENABLE(cgen-maint,
+[AS_HELP_STRING([--enable-cgen-maint[=DIR]], [build cgen generated files])],
+[case "${enableval}" in
+  yes) cgen_maint=yes ;;
+  no)  cgen_maint=no ;;
+  *)
+       # Argument is a directory where cgen can be found.  In some
+       # future world cgen could be installable, but right now this
+       # is not the case.  Instead we assume the directory is a path
+       # to the cgen source tree.
+       cgen_maint=yes
+        if test -r ${enableval}/iformat.scm; then
+          # This looks like a cgen source tree.
+         cgendir=${enableval}
+        else
+         AC_MSG_ERROR(${enableval} doesn't look like a cgen source tree)
+        fi
+       ;;
+esac])dnl
+dnl AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} != xno)
+if test x${cgen_maint} != xno ; then
+  CGEN_MAINT=''
+else
+  CGEN_MAINT='#'
+fi
+AC_SUBST(CGEN_MAINT)
+AC_SUBST(cgendir)
+AC_SUBST(cgen)
+])
diff --git a/sim/m4/sim_ac_option_default_model.m4 b/sim/m4/sim_ac_option_default_model.m4
new file mode 100644 (file)
index 0000000..1150937
--- /dev/null
@@ -0,0 +1,31 @@
+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 The argument is the default model if none is specified.
+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL],
+[
+default_sim_default_model="ifelse([$1],,0,[$1])"
+AC_ARG_ENABLE(sim-default-model,
+[AS_HELP_STRING([--enable-sim-default-model=model],
+               [Specify default model to simulate])],
+[case "${enableval}" in
+  yes|no) AC_MSG_ERROR("Missing argument to --enable-sim-default-model");;
+  *)   sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
+  echo "Setting default model = $sim_default_model" 6>&1
+fi],[sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"])
+])
+AC_SUBST(sim_default_model)
diff --git a/sim/m4/sim_ac_option_endian.m4 b/sim/m4/sim_ac_option_endian.m4
new file mode 100644 (file)
index 0000000..e5a5b61
--- /dev/null
@@ -0,0 +1,65 @@
+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 --enable-sim-endian={yes,no,big,little} is for simulators
+dnl that support both big and little endian targets.
+dnl arg[1] is hardwired target endianness.
+dnl arg[2] is default target endianness.
+AC_DEFUN([SIM_AC_OPTION_ENDIAN],
+[
+wire_endian="[$1]"
+default_endian="[$2]"
+AC_ARG_ENABLE(sim-endian,
+[AS_HELP_STRING([--enable-sim-endian=endian],
+               [Specify target byte endian orientation])],
+[case "${enableval}" in
+  b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_BIG";;
+  l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE";;
+  yes)  if test x"$wire_endian" != x; then
+          sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
+        else
+         if test x"$default_endian" != x; then
+            sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
+          else
+            echo "No hard-wired endian for target $target" 1>&6
+            sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
+          fi
+        fi;;
+  no)   if test x"$default_endian" != x; then
+          sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
+        else
+          if test x"$wire_endian" != x; then
+            sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
+          else
+            echo "No default endian for target $target" 1>&6
+            sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
+          fi
+        fi;;
+  *)    AC_MSG_ERROR("Unknown value $enableval for --enable-sim-endian"); sim_endian="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then
+  echo "Setting endian flags = $sim_endian" 6>&1
+fi],
+[if test x"$default_endian" != x; then
+  sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
+else
+  if test x"$wire_endian" != x; then
+    sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
+  else
+    sim_endian=
+  fi
+fi])dnl
+])
+AC_SUBST(sim_endian)
diff --git a/sim/m4/sim_ac_option_environment.m4 b/sim/m4/sim_ac_option_environment.m4
new file mode 100644 (file)
index 0000000..d49c5b2
--- /dev/null
@@ -0,0 +1,45 @@
+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 Additional SIM options that can (optionally) be configured
+dnl For optional simulator options, a macro SIM_AC_OPTION_* is defined.
+dnl Simulators that wish to use the relevant option specify the macro
+dnl in the simulator specific configure.ac file between the SIM_AC_COMMON
+dnl and SIM_AC_OUTPUT lines.
+dnl
+dnl Specify the running environment.
+dnl If the simulator invokes this in its configure.ac then without this option
+dnl the default is the user environment and all are runtime selectable.
+dnl If the simulator doesn't invoke this, only the user environment is
+dnl supported.
+dnl ??? Until there is demonstrable value in doing something more complicated,
+dnl let's not.
+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT],
+[
+AC_MSG_CHECKING([default sim environment setting])
+sim_environment="ALL_ENVIRONMENT"
+AC_ARG_ENABLE(sim-environment,
+[AS_HELP_STRING([--enable-sim-environment=environment],
+               [Specify mixed, user, virtual or operating environment])],
+[case "${enableval}" in
+  all | ALL)             sim_environment="ALL_ENVIRONMENT";;
+  user | USER)           sim_environment="USER_ENVIRONMENT";;
+  virtual | VIRTUAL)     sim_environment="VIRTUAL_ENVIRONMENT";;
+  operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+  *)   AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-environment]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_ENVIRONMENT], [$sim_environment], [Sim default environment])
+AC_MSG_RESULT($sim_environment)
+])
diff --git a/sim/m4/sim_ac_option_float.m4 b/sim/m4/sim_ac_option_float.m4
new file mode 100644 (file)
index 0000000..a38678c
--- /dev/null
@@ -0,0 +1,47 @@
+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 --enable-sim-float is for developers of the simulator
+dnl It specifies the presence of hardware floating point
+dnl And optionally the bitsize of the floating point register.
+dnl arg[1] specifies the presence (or absence) of floating point hardware
+dnl arg[2] specifies the number of bits in a floating point register
+AC_DEFUN([SIM_AC_OPTION_FLOAT],
+[
+default_sim_float="[$1]"
+default_sim_float_bitsize="[$2]"
+AC_ARG_ENABLE(sim-float,
+[AS_HELP_STRING([--enable-sim-float],
+               [Specify that the target processor has floating point hardware])],
+[case "${enableval}" in
+  yes | hard)  sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT";;
+  no | soft)   sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";;
+  32)           sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=32";;
+  64)           sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=64";;
+  *)           AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-float"); sim_float="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_float" != x""; then
+  echo "Setting float flags = $sim_float" 6>&1
+fi],[
+sim_float=
+if test x"${default_sim_float}" != x""; then
+  sim_float="-DWITH_FLOATING_POINT=${default_sim_float}"
+fi
+if test x"${default_sim_float_bitsize}" != x""; then
+  sim_float="$sim_float -DWITH_TARGET_FLOATING_POINT_BITSIZE=${default_sim_float_bitsize}"
+fi
+])dnl
+])
+AC_SUBST(sim_float)
diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4
new file mode 100644 (file)
index 0000000..cc84fad
--- /dev/null
@@ -0,0 +1,81 @@
+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 --enable-sim-hardware is for users of the simulator
+dnl arg[1] Enable sim-hw by default? ("yes" or "no")
+dnl arg[2] is a space separated list of devices that override the defaults
+dnl arg[3] is a space separated list of extra target specific devices.
+AC_DEFUN([SIM_AC_OPTION_HARDWARE],
+[
+if test "[$2]"; then
+  hardware="[$2]"
+else
+  hardware="cfi core pal glue"
+fi
+hardware="$hardware [$3]"
+
+sim_hw_cflags="-DWITH_HW=1"
+sim_hw="$hardware"
+sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`"
+
+AC_ARG_ENABLE(sim-hardware,
+  [AS_HELP_STRING([--enable-sim-hardware=LIST],
+                  [Specify the hardware to be included in the build.])],
+  ,[enable_sim_hardware="[$1]"])
+case ${enable_sim_hardware} in
+  yes|no) ;;
+  ,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
+  *,) hardware="`echo ${enableval} | sed -e 's/,/ /'` ${hardware}";;
+  *)  hardware="`echo ${enableval} | sed -e 's/,/ /'`"'';;
+esac
+
+if test "$enable_sim_hardware" = no; then
+  sim_hw_objs=
+  sim_hw_cflags="-DWITH_HW=0"
+  sim_hw=
+else
+  sim_hw_cflags="-DWITH_HW=1"
+  # remove duplicates
+  sim_hw=""
+  sim_hw_objs="\$(SIM_COMMON_HW_OBJS)"
+  for i in $hardware ; do
+    case " $sim_hw " in
+      *" $i "*) ;;
+      *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
+    esac
+  done
+  # mingw does not support sockser
+  case ${host} in
+    *mingw*) ;;
+    *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
+       # that you instatiate.  Instead, other code will call into it directly.
+       # At some point, we should convert it over.
+       sim_hw_objs="$sim_hw_objs dv-sockser.o"
+       AC_DEFINE_UNQUOTED(
+         [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
+       ;;
+  esac
+  if test x"$silent" != x"yes"; then
+    echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
+  fi
+  dnl Some devices require extra libraries.
+  case " $hardware " in
+    *" cfi "*) AC_CHECK_LIB(m, log2);;
+  esac
+fi
+])
+AC_SUBST(sim_hw_cflags)
+AC_SUBST(sim_hw_objs)
+AC_SUBST(sim_hw)
diff --git a/sim/m4/sim_ac_option_inline.m4 b/sim/m4/sim_ac_option_inline.m4
new file mode 100644 (file)
index 0000000..42221bc
--- /dev/null
@@ -0,0 +1,50 @@
+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 --enable-sim-inline is for users that wish to ramp up the simulator's
+dnl performance by inlining functions.
+dnl Default sims to no inlining.
+AC_DEFUN([SIM_AC_OPTION_INLINE],
+[
+sim_inline="-DDEFAULT_INLINE=m4_ifblank([$1],[0],[$1])"
+AC_ARG_ENABLE(sim-inline,
+[AS_HELP_STRING([--enable-sim-inline=inlines],
+               [Specify which functions should be inlined])],
+[sim_inline=""
+case "$enableval" in
+  no)          sim_inline="-DDEFAULT_INLINE=0";;
+  0)           sim_inline="-DDEFAULT_INLINE=0";;
+  yes | 2)     sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
+  1)           sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
+  *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+       new_flag=""
+       case "$x" in
+        *_INLINE=*)    new_flag="-D$x";;
+        *=*)           new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
+        *_INLINE)      new_flag="-D$x=ALL_C_INLINE";;
+        *)             new_flag="-D$x""_INLINE=ALL_C_INLINE";;
+       esac
+       if test x"$sim_inline" = x""; then
+        sim_inline="$new_flag"
+       else
+        sim_inline="$sim_inline $new_flag"
+       fi
+     done;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
+  echo "Setting inline flags = $sim_inline" 6>&1
+fi])dnl
+])
+AC_SUBST(sim_inline)
diff --git a/sim/m4/sim_ac_option_reserved_bits.m4 b/sim/m4/sim_ac_option_reserved_bits.m4
new file mode 100644 (file)
index 0000000..8147ed8
--- /dev/null
@@ -0,0 +1,30 @@
+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/>.
+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS],
+[
+default_sim_reserved_bits="ifelse([$1],,1,[$1])"
+AC_ARG_ENABLE(sim-reserved-bits,
+[AS_HELP_STRING([--enable-sim-reserved-bits],
+               [Specify whether to check reserved bits in instruction])],
+[case "${enableval}" in
+  yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
+  no)  sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
+  *)   AC_MSG_ERROR("--enable-sim-reserved-bits does not take a value"); sim_reserved_bits="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
+  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
+fi],[sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"])dnl
+])
+AC_SUBST(sim_reserved_bits)
diff --git a/sim/m4/sim_ac_option_scache.m4 b/sim/m4/sim_ac_option_scache.m4
new file mode 100644 (file)
index 0000000..20e3615
--- /dev/null
@@ -0,0 +1,34 @@
+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 The argument is the default cache size if none is specified.
+AC_DEFUN([SIM_AC_OPTION_SCACHE],
+[
+default_sim_scache="ifelse([$1],,0,[$1])"
+AC_ARG_ENABLE(sim-scache,
+[AS_HELP_STRING([--enable-sim-scache=size],
+               [Specify simulator execution cache size])],
+[case "${enableval}" in
+  yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";;
+  no)  sim_scache="-DWITH_SCACHE=0" ;;
+  [[0-9]]*) sim_scache="-DWITH_SCACHE=${enableval}";;
+  *)   AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache");
+       sim_scache="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then
+  echo "Setting scache size = $sim_scache" 6>&1
+fi],[sim_scache="-DWITH_SCACHE=${default_sim_scache}"])
+])
+AC_SUBST(sim_scache)
diff --git a/sim/m4/sim_ac_option_smp.m4 b/sim/m4/sim_ac_option_smp.m4
new file mode 100644 (file)
index 0000000..9f384e2
--- /dev/null
@@ -0,0 +1,31 @@
+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/>.
+AC_DEFUN([SIM_AC_OPTION_SMP],
+[
+AC_MSG_CHECKING([number of sim cpus to support])
+default_sim_smp="ifelse([$1],,5,[$1])"
+sim_smp="$default_sim_smp""
+AC_ARG_ENABLE(sim-smp,
+[AS_HELP_STRING([--enable-sim-smp=n],
+               [Specify number of processors to configure for (default ${default_sim_smp})])],
+[case "${enableval}" in
+  yes) sim_smp="5";;
+  no)  sim_smp="0";;
+  *)   sim_smp="$enableval";;
+esac])dnl
+sim_igen_smp="-N ${sim_smp}"
+AC_DEFINE_UNQUOTED([WITH_SMP], [$sim_smp], [Sim SMP settings])
+AC_MSG_RESULT($sim_smp)
+])
diff --git a/sim/m4/sim_ac_option_warnings.m4 b/sim/m4/sim_ac_option_warnings.m4
new file mode 100644 (file)
index 0000000..dc98370
--- /dev/null
@@ -0,0 +1,103 @@
+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 --enable-build-warnings is for developers of the simulator.
+dnl it enables extra GCC specific warnings.
+dnl arg[1] Enable -Werror by default? ("yes" or "no")
+AC_DEFUN([SIM_AC_OPTION_WARNINGS],
+[
+AC_ARG_ENABLE(werror,
+  AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
+  [case "${enableval}" in
+     yes | y) ERROR_ON_WARNING="yes" ;;
+     no | n)  ERROR_ON_WARNING="no" ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
+   esac])
+
+# Enable -Werror by default when using gcc
+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
+    ERROR_ON_WARNING=yes
+fi
+
+WERROR_CFLAGS=""
+m4_if(m4_default([$1], [yes]), [yes], [dnl
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi
+])dnl
+
+build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
+-Wpointer-sign \
+-Wno-unused -Wunused-value -Wunused-function \
+-Wno-switch -Wno-char-subscripts -Wmissing-prototypes
+-Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \
+-Wold-style-declaration -Wold-style-definition"
+
+# Enable -Wno-format by default when using gcc on mingw since many
+# GCC versions complain about %I64.
+case "${host}" in
+  *-*-mingw32*) build_warnings="$build_warnings -Wno-format" ;;
+  *) build_warnings="$build_warnings -Wformat-nonliteral" ;;
+esac
+
+AC_ARG_ENABLE(build-warnings,
+AS_HELP_STRING([--enable-build-warnings], [enable build-time compiler warnings if gcc is used]),
+[case "${enableval}" in
+  yes) ;;
+  no)  build_warnings="-w";;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${build_warnings} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${t} ${build_warnings}";;
+  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
+  echo "Setting compiler warning flags = $build_warnings" 6>&1
+fi])dnl
+AC_ARG_ENABLE(sim-build-warnings,
+AS_HELP_STRING([--enable-sim-build-warnings], [enable SIM specific build-time compiler warnings if gcc is used]),
+[case "${enableval}" in
+  yes) ;;
+  no)  build_warnings="-w";;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${build_warnings} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${t} ${build_warnings}";;
+  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
+  echo "Setting GDB specific compiler warning flags = $build_warnings" 6>&1
+fi])dnl
+WARN_CFLAGS=""
+if test "x${build_warnings}" != x -a "x$GCC" = xyes
+then
+    AC_MSG_CHECKING(compiler warning flags)
+    # Separate out the -Werror flag as some files just cannot be
+    # compiled with it enabled.
+    for w in ${build_warnings}; do
+       case $w in
+       -Werr*) WERROR_CFLAGS=-Werror ;;
+       *) # Check that GCC accepts it
+           saved_CFLAGS="$CFLAGS"
+           CFLAGS="$CFLAGS $w"
+           AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",)
+           CFLAGS="$saved_CFLAGS"
+       esac
+    done
+    AC_MSG_RESULT(${WARN_CFLAGS} ${WERROR_CFLAGS})
+fi
+])
+AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WERROR_CFLAGS)
diff --git a/sim/m4/sim_ac_option_xor_endian.m4 b/sim/m4/sim_ac_option_xor_endian.m4
new file mode 100644 (file)
index 0000000..0ed97c5
--- /dev/null
@@ -0,0 +1,30 @@
+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/>.
+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN],
+[
+AC_MSG_CHECKING([for xor endian support])
+default_sim_xor_endian="ifelse([$1],,8,[$1])"
+sim_xor_endian="$default_sim_xor_endian"
+AC_ARG_ENABLE(sim-xor-endian,
+[AS_HELP_STRING([--enable-sim-xor-endian=n],
+               [Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian})])],
+[case "${enableval}" in
+  yes) sim_xor_endian="8";;
+  no)  sim_xor_endian="0";;
+  *)   sim_xor_endian="$enableval";;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_XOR_ENDIAN], [$sim_xor_endian], [Sim XOR endian settings])
+AC_MSG_RESULT($sim_smp)
+])
diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4
new file mode 100644 (file)
index 0000000..9ec566d
--- /dev/null
@@ -0,0 +1,62 @@
+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 Generate the Makefile in a target specific directory.
+dnl Substitutions aren't performed on the file in AC_SUBST_FILE,
+dnl so this is a cover macro to tuck the details away of how we cope.
+dnl We cope by having autoconf generate two files and then merge them into
+dnl one afterwards.  The two pieces of the common fragment are inserted into
+dnl the target's fragment at the appropriate points.
+AC_DEFUN([SIM_AC_OUTPUT],
+[dnl
+AC_REQUIRE([SIM_AC_OPTION_WARNINGS])dnl
+
+dnl Make @cgen_breaks@ non-null only if the sim uses CGEN.
+cgen_breaks=""
+if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
+cgen_breaks="break cgen_rtx_error";
+fi
+AC_SUBST(cgen_breaks)
+AC_CONFIG_FILES(Makefile.sim:Makefile.in)
+AC_CONFIG_FILES(Make-common.sim:../common/Make-common.in)
+AC_CONFIG_FILES(.gdbinit:../common/gdbinit.in)
+AC_CONFIG_COMMANDS([Makefile],
+[echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
+ rm -f Makesim1.tmp Makesim2.tmp Makefile
+ sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
+ sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
+ sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
+       -e '/^## COMMON_POST_/ r Makesim2.tmp' \
+       <Makefile.sim >Makefile
+ rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
+])
+AC_CONFIG_COMMANDS([stamp-h], [echo > stamp-h])
+
+dnl These are unfortunate.  They are conditionally called by other sim macros
+dnl but always used by common/Make-common.in.  So we have to subst here even
+dnl when the rest of the code is in the respective macros.
+AC_SUBST(sim_alignment)
+AC_SUBST(sim_bitsize)
+AC_SUBST(sim_endian)
+AC_SUBST(sim_float)
+AC_SUBST(sim_scache)
+AC_SUBST(sim_default_model)
+AC_SUBST(sim_hw_cflags)
+AC_SUBST(sim_hw_objs)
+AC_SUBST(sim_hw)
+AC_SUBST(sim_reserved_bits)
+
+AC_OUTPUT
+])
index 7deb1b6d2d7f94c256d5337fa4b375b52603ed90..5223443bf61546f14ef28365cb790857eeddcd7e 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..1183d422cc33668ca02d181c235013081d9fa437 100644 (file)
@@ -98,6 +98,15 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +119,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 32a326946c4f3d3b514640dcd37d6457e30c1d35..6498bf0020bbd3e48965d2d243679a9701dd2bcd 100755 (executable)
@@ -631,6 +631,11 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_default_model
+sim_scache
+sim_float
+sim_bitsize
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,16 +752,11 @@ 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='
@@ -11794,7 +11794,6 @@ _ACEOF
 
 
 
-
 wire_endian="BIG"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12106,6 +12105,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
index 34ae17ea93a0e75e1c869725f0c475e067cd5a45..6148d1dae4efab0f290f1298bfda9ea19bfd1bd7 100644 (file)
@@ -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
 
index 96da9c1836abf0a7d5b9967ad5aba7be12eab607..575451b072f354518a18092981b9457d2ec5bf8f 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 7ed827d926c62d09af20e158ed527238bda988eb..ce4eab5bccfe46c9e90c863797e2ecc8ac1d1f52 100755 (executable)
@@ -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.
@@ -11996,6 +11995,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
index a22577f76170a64f25a375dbc17d2a06169721c5..4417ba4e561edc6fff82c6621cbcb276cba8d79f 100644 (file)
@@ -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
 
index a61834961f5df1f924cd117e9602489902bea90f..b93e3117c9f55fb1ddbb598d47feb8238dabd00d 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 7236ae17aefd71991fcbc714391702a73a1bb919..55e854ad2b2df33fd48dd1792e686b97b02bd311 100755 (executable)
@@ -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
index e1300c85abc2a91fa9ac32408826c3d4fac258ab..88fac82e7b4c19712e6221b9d1c583b592ad599d 100644 (file)
@@ -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
 
index 56493604001a54c3bda623b4904d3bea0ced54ef..5b3517648f0d10d7f44b16c92287395f95a5ec80 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3a4af946103a55b5737539855a14f1b750384dc1 100644 (file)
@@ -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_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_float.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([../../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])
index 53afe738651a2ee081fb8bad8d38d208099709af..aa877ad7111bf87355a4bdfb3276772d258a82b0 100755 (executable)
@@ -631,6 +631,8 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_default_model
+sim_scache
 cgen_breaks
 mips_extra_libs
 XMKMF
@@ -765,8 +767,6 @@ sim_inline
 sim_hw
 sim_hw_objs
 sim_hw_cflags
-sim_default_model
-sim_scache
 sim_float
 sim_endian
 sim_bitsize
@@ -11823,7 +11823,6 @@ _ACEOF
 
 
 
-
 wire_alignment="NONSTRICT_ALIGNMENT"
 default_alignment=""
 
@@ -12925,6 +12924,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
index fe8f4b0386a1c396b6fb523e134b79aa3a09367b..ec45245dc1f5afff3066b5acfc5f7db1b4859343 100644 (file)
@@ -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
 
index 4f77dae368a2f470773ba07258815cfe6e9a5b41..b8f6bb7bcd7554ea32e9fa3a07f77191f037aeb1 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..1d6e9ad605aab8450573622578a73de1824b8c81 100644 (file)
@@ -98,6 +98,17 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +121,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 512151ce978e1ad2ce5805a742e58d34d5696a05..1d9dfd4c01329a2cab2d6c2aeb30fa0632830463 100755 (executable)
@@ -631,6 +631,9 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_default_model
+sim_scache
+sim_float
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -752,9 +755,6 @@ sim_inline
 sim_hw
 sim_hw_objs
 sim_hw_cflags
-sim_default_model
-sim_scache
-sim_float
 sim_endian
 sim_bitsize
 sim_alignment'
@@ -11800,7 +11800,6 @@ _ACEOF
 
 
 
-
 wire_endian="LITTLE"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12212,6 +12211,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
index 1e7498a81a604c8bd2bdfd18526bf44fe8c0002e..e2ae2d835b293af6bffa629ce521f05099821684 100644 (file)
@@ -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
 
index 91edfa59deaa6ed3c14559480119018f06fb74b6..4bf37fa6504ff8d19fa15339eefe4f4fad10a131 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 01dfb41472db3f7ec145504aaff1bdf0302d406a..61fe1dd42a35de82b68bcd51ddc8af1c0854de6a 100755 (executable)
@@ -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
 DTC
 REPORT_BUGS_TEXI
@@ -748,16 +756,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
 
 
 
-
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dtc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dtc; ac_word=$2
@@ -12093,6 +12092,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
index 3e9a987082e44df887fd6e333bcdbff9a813e6c7..fb5a91eacf8f15f21a564f4c630501df8ba25d68 100644 (file)
@@ -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
 
index 8b9d8527f13694db17599a1a1ab434d27a413a1d..0234fd4e022f0b9b71a189146b02063541080b0f 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 68104e47f0b46eab442663def90b9e742e7517df..0757df04e680af6ea7a9772576a7bbdacf5d8055 100755 (executable)
@@ -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='
@@ -11790,7 +11790,6 @@ _ACEOF
 
 
 
-
 for ac_header in getopt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
@@ -12012,6 +12011,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
index f74cd7ed5074003f9b2fd328daa52502fd519a82..68e9467339a9135ba5b4490da3fe230abad17a46 100644 (file)
@@ -19,7 +19,7 @@ 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
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
index ca31ff0bc6d7446d30ca84490f02813ff348888f..01a2dd7504e1ce4e084e67319dcbad8ab87151d0 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..14d865b222e0476da3e12e5b7319fa96fba4acc5 100644 (file)
@@ -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])
index 7be22269d0454fd2b136b7964f95a8b7aafb2304..b52bd90252646d78c85e47bf2ce0895f6c3f358f 100755 (executable)
@@ -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
index a025e034b91b34f5a5a17d5f671f22711cc26533..ed0739f74a5697d9ec7a3992364439986a83f6e4 100644 (file)
@@ -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
 
index f74a22a1abb282ec790ce6453605420b4624b152..6482fbab1d745cf2cb3a8749c8281519a0c1a281 100644 (file)
@@ -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([../.. ../../config])
 
 AC_PROG_INSTALL
 AC_PROG_CC
index dd291b5799c5da1f4205ef5ef3b6c6cafcdf6e19..afe4c153786abe400647e68137f65875318be6ad 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 84107ef082bc97a9fd51d56101499d7cb1998ede..13fe9653d3fd3ecb2dc7a47aafbf3db0c1bdbe2d 100755 (executable)
@@ -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="LITTLE"
 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
index dcc2cbae3eff2cb51984bdb5e3f6a7b75faa480d..a4db77beec2f891b3f9626c370046f7669a804a7 100644 (file)
@@ -19,7 +19,7 @@ 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
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
index 00d90c3531da04d9976631ac2fd4b3634bf143f5..f5994b113ef6cefb868b10a33d8e620656f12e05 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..71fe45d9edcc649bb7e69673de8b7ae4ab4a7476 100644 (file)
@@ -98,6 +98,16 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +120,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index e335680cbcb662bf6c78d0af7ed4b089f76d4449..be787e2f0781515798d7f742681fcd2ca541e826 100755 (executable)
@@ -631,6 +631,12 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_hw
+sim_hw_objs
+sim_hw_cflags
+sim_scache
+sim_float
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,15 +753,9 @@ 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_default_model
 sim_bitsize
 sim_alignment'
 ac_subst_files=''
@@ -11796,7 +11796,6 @@ _ACEOF
 
 
 
-
 wire_endian="LITTLE"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12115,6 +12114,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
index d7505f916fa1a8e79798b1c6897bbdfef5859b1e..84b236adf4f77a2cae61193dc42f85dfe843400c 100644 (file)
@@ -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
 
index a2a1974746f8b1010434436054ed391213db7f01..895ff6127d6626ca7231351d6f3e7b075d9d3fa1 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..a29db710788c76d9d7f2906511f83ac430fd17c9 100644 (file)
@@ -98,6 +98,12 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +116,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 1ecbeed8b6a64ee8251527e3115b9cf565b618cb..6f350ed8b045a79620937c8ecf6e6e5715f50c99 100755 (executable)
@@ -631,6 +631,16 @@ 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_endian
+sim_bitsize
+sim_alignment
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,17 +757,7 @@ 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'
+sim_inline'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -11783,7 +11783,6 @@ _ACEOF
 
 
 
-
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; case "${enableval}" in
@@ -11910,6 +11909,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
index decb7e66270a36dece2b09aaa1de73eb2e350440..1314b980fea07217f98994c15c8965e4d0ea9faa 100644 (file)
@@ -19,7 +19,7 @@ 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
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 SIM_AC_OPTION_WARNINGS(no)
index e78fe61dab5fea8c67a69cec56343ef0fef25bca..a6e16e9a3ca04af591bbe1e3440a91c8c118cceb 100644 (file)
@@ -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>
 
        * trace.c (load_file_and_line): Use fread return value to index
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..a29db710788c76d9d7f2906511f83ac430fd17c9 100644 (file)
@@ -98,6 +98,12 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +116,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index 1a2d7ea6136ce527411a70bce59d1b091348ca1e..545298f4a0f54459a521d91fd3f947d0f08e3992 100755 (executable)
@@ -631,6 +631,16 @@ 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_endian
+sim_bitsize
+sim_alignment
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,17 +757,7 @@ 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'
+sim_inline'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -11788,7 +11788,6 @@ _ACEOF
 
 
 
-
 for ac_header in getopt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
@@ -11955,6 +11954,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
index 1b1ceb2b5066244b87c95b0562cdbda7dcb12fba..16e64a5569026fc186aaa1d07237522e9ad4568f 100644 (file)
@@ -19,7 +19,7 @@ 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
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 
index 0edf1bfbfb4efce98d0589f667e0a6bef4aa52f9..ed97d983ef4e866dbc10b7476c841fdca792fac4 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..3326ca9834f1ff6282825b80980e86e98e77cb16 100644 (file)
@@ -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])
index 7ed827d926c62d09af20e158ed527238bda988eb..ce4eab5bccfe46c9e90c863797e2ecc8ac1d1f52 100755 (executable)
@@ -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.
@@ -11996,6 +11995,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
index a22577f76170a64f25a375dbc17d2a06169721c5..4417ba4e561edc6fff82c6621cbcb276cba8d79f 100644 (file)
@@ -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
 
index 2a3cb5b21ba62eeef4101e05917ac051d5c21825..a6106056ac9e0adb65ffe659b57f1ae101b04061 100644 (file)
@@ -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.
index 1c83b202f0b4edc4b24dbff513b182f8e9620bb4..f3d00fb79a5ca5245a36420232b786a7197b3192 100644 (file)
@@ -98,6 +98,16 @@ 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([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +120,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
index d57e476d2309060a13f19ef4bdcbaf4671091845..524b52afb85e62199bbd2ad536e14728e75e4dbe 100755 (executable)
@@ -631,6 +631,12 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_hw
+sim_hw_objs
+sim_hw_cflags
+sim_default_model
+sim_scache
+sim_float
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -749,12 +755,6 @@ 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'
@@ -11797,7 +11797,6 @@ _ACEOF
 
 
 
-
 wire_endian="LITTLE"
 default_endian=""
 # Check whether --enable-sim-endian was given.
@@ -12105,6 +12104,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
index f8f0355db07b3f581bfc728280ed09f50634396b..47a5d15cbc6cce2cd829c1529b0f3459f9f8948c 100644 (file)
@@ -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