diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-06-19 01:36:30 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-20 00:39:38 -0400 |
commit | 3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39 (patch) | |
tree | 3447c001bed2b46f077eb96ec351216ffd663e74 /sim | |
parent | 3a829bc50c1da3163329356e561d5bf5b218ce35 (diff) | |
download | gdb-3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39.zip gdb-3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39.tar.gz gdb-3eda63f2e4fc1c8e7a472f2db128c7acfe95bd39.tar.bz2 |
sim: delete SIM_AC_COMMON macro
Now that we've moved all content out to the common file, this is
empty and can be deleted it entirely.
Diffstat (limited to 'sim')
127 files changed, 160 insertions, 188 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 9bbf9e7..5ccfdba 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * README-HACKING (SIM_AC_COMMON): Delete mention. + * m4/sim_ac_common.m4: Removed. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * arch-subdir.mk.in (MAINT): Define. * m4/sim_ac_common.m4: Delete AM_MAINTAINER_MODE call. diff --git a/sim/README-HACKING b/sim/README-HACKING index d4867c9..3715467 100644 --- a/sim/README-HACKING +++ b/sim/README-HACKING @@ -41,20 +41,11 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../common ../.. ../../config]) -SIM_AC_COMMON - ... target specific additions ... SIM_AC_OUTPUT --- snip --- -SIM_AC_COMMON: - -- invokes the autoconf macros most often used by the simulators -- defines --enable/--with options usable by all simulators -- initializes sim_link_files/sim_link_links as the set of symbolic links - to set up - SIM_AC_OUTPUT: - creates the symbolic links defined in sim_link_{files,links} diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index 1467a07..7ca8219 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/aarch64/aclocal.m4 +++ b/sim/aarch64/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/aarch64/configure b/sim/aarch64/configure index d857477..b62feb4 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac index 849e957..3d4290a 100644 --- a/sim/aarch64/configure.ac +++ b/sim/aarch64/configure.ac @@ -22,6 +22,4 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>. */ AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index ad31dd2..164c785 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/arm/aclocal.m4 +++ b/sim/arm/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/arm/configure b/sim/arm/configure index d857477..b62feb4 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/arm/configure.ac +++ b/sim/arm/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 9637f75..e200f20 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/avr/aclocal.m4 +++ b/sim/avr/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/avr/configure b/sim/avr/configure index d857477..b62feb4 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/avr/configure.ac +++ b/sim/avr/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 30c2c77..e3e352a 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * Makefile.in: Change @MAINTAINER_MODE_TRUE@ to $(MAINT). * aclocal.m4, configure: Regenerate. diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index 5d45008..abca26e 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -13,7 +13,6 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../../config/pkg.m4]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/bfin/configure b/sim/bfin/configure index 5f64567..0453bae 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -1808,8 +1808,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_default_model="bf537" # Check whether --enable-sim-default-model was given. if test "${enable_sim_default_model+set}" = set; then : diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index 9b17dc4..4e31c6f 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_DEFAULT_MODEL(bf537) SIM_AC_OPTION_HARDWARE(\ bfin_cec \ diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog index 339857e..e31f509 100644 --- a/sim/bpf/ChangeLog +++ b/sim/bpf/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4 index 4b13aea..c7a6371 100644 --- a/sim/bpf/aclocal.m4 +++ b/sim/bpf/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) diff --git a/sim/bpf/configure b/sim/bpf/configure index 2c0d9a8..e07b470 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -1687,8 +1687,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - wire_word_bitsize="64" wire_word_msb="" wire_address_bitsize="" diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac index 13516a0..3272937 100644 --- a/sim/bpf/configure.ac +++ b/sim/bpf/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_BITSIZE([64]) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL([bpf-def]) diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 54a8ce8..15b31dc 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/cr16/aclocal.m4 +++ b/sim/cr16/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/cr16/configure b/sim/cr16/configure index d857477..b62feb4 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/cr16/configure.ac +++ b/sim/cr16/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 8574501..ad25fc4 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index 79b3a89..08ac8b1 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) diff --git a/sim/cris/configure b/sim/cris/configure index b173585..4c45fc6 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_scache="16384" # Check whether --enable-sim-scache was given. if test "${enable_sim_scache+set}" = set; then : diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac index 909c416..13500a0 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx) diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 2990f4e..e0c518c 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/d10v/aclocal.m4 +++ b/sim/d10v/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/d10v/configure b/sim/d10v/configure index d857477..b62feb4 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/d10v/configure.ac +++ b/sim/d10v/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 38da15a..ef7025f 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/erc32/aclocal.m4 +++ b/sim/erc32/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/erc32/configure b/sim/erc32/configure index 4fda8ef..cc8c9be 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -1833,8 +1833,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # In the Cygwin environment, we need some additional flags. ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac index 3cb35d8..db6b98e 100644 --- a/sim/erc32/configure.ac +++ b/sim/erc32/configure.ac @@ -17,8 +17,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - # In the Cygwin environment, we need some additional flags. AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, [AC_EGREP_CPP(lose, [ diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index 9ec4923..ef2e97d 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/example-synacor/aclocal.m4 +++ b/sim/example-synacor/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure index d857477..b62feb4 100755 --- a/sim/example-synacor/configure +++ b/sim/example-synacor/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/example-synacor/configure.ac b/sim/example-synacor/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/example-synacor/configure.ac +++ b/sim/example-synacor/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 09cfffc..99d24c3 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index 79b3a89..08ac8b1 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) diff --git a/sim/frv/configure b/sim/frv/configure index 83cba71..f332cd1 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -1689,8 +1689,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_scache="16384" # Check whether --enable-sim-scache was given. if test "${enable_sim_scache+set}" = set; then : diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index a03b4f6..83ad011 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(fr500) diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index d0a9f0c..ba229fc 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/ft32/aclocal.m4 +++ b/sim/ft32/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/ft32/configure b/sim/ft32/configure index d857477..b62feb4 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/ft32/configure.ac +++ b/sim/ft32/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 1c2b5fc..a495f5f 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/h8300/aclocal.m4 +++ b/sim/h8300/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/h8300/configure b/sim/h8300/configure index d857477..b62feb4 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/h8300/configure.ac +++ b/sim/h8300/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 923e7e8..2b1416b 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index 79b3a89..08ac8b1 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 22e88e3..d191f2e 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_scache="16384" # Check whether --enable-sim-scache was given. if test "${enable_sim_scache+set}" = set; then : diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac index c434633..e35068f 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(iq2000) diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index d7ee339..c731116 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index 79b3a89..08ac8b1 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) diff --git a/sim/lm32/configure b/sim/lm32/configure index b65aa25..a50fe62 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_scache="16384" # Check whether --enable-sim-scache was given. if test "${enable_sim_scache+set}" = set; then : diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac index b277c96..edf7968 100644 --- a/sim/lm32/configure.ac +++ b/sim/lm32/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(lm32) SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart) diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 1c60ffc..aab1e0d 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/m32c/aclocal.m4 +++ b/sim/m32c/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m32c/configure b/sim/m32c/configure index d857477..b62feb4 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac index 4f2c0ac..7d86d83 100644 --- a/sim/m32c/configure.ac +++ b/sim/m32c/configure.ac @@ -21,6 +21,4 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index c4a4240..688ff01 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index 79b3a89..08ac8b1 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_scache.m4]) diff --git a/sim/m32r/configure b/sim/m32r/configure index 9acd629..79ce485 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -1688,8 +1688,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_scache="16384" # Check whether --enable-sim-scache was given. if test "${enable_sim_scache+set}" = set; then : diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index 2e6b415..a45eebd 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(m32r/d) diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4 deleted file mode 100644 index e15ec02..0000000 --- a/sim/m4/sim_ac_common.m4 +++ /dev/null @@ -1,24 +0,0 @@ -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], -[dnl -]) dnl End of SIM_AC_COMMON diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 797dc4b..9f6a877 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/m68hc11/aclocal.m4 +++ b/sim/m68hc11/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index ec81e7b..a1e2842 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue \ m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram" sim_hw_cflags="-DWITH_HW=1" diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac index 986d8ad..02eccf0 100644 --- a/sim/m68hc11/configure.ac +++ b/sim/m68hc11/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - dnl Options available in this module SIM_AC_OPTION_HARDWARE(\ m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram) diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index b0cb3b1..d2e9b56 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/mcore/aclocal.m4 +++ b/sim/mcore/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/mcore/configure b/sim/mcore/configure index d857477..b62feb4 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/mcore/configure.ac +++ b/sim/mcore/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index 1020037..910ed55 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/microblaze/aclocal.m4 +++ b/sim/microblaze/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/microblaze/configure b/sim/microblaze/configure index d857477..b62feb4 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/microblaze/configure.ac +++ b/sim/microblaze/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 93b8fcf..a5685c5 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4 index 3eec464..95e62b9 100644 --- a/sim/mips/aclocal.m4 +++ b/sim/mips/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_float.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) diff --git a/sim/mips/configure b/sim/mips/configure index e1362ae..4beb1e9 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -1699,8 +1699,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_reserved_bits="1" # Check whether --enable-sim-reserved-bits was given. if test "${enable_sim_reserved_bits+set}" = set; then : diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index d8ce280..a8c16b2 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - dnl Options available in this module SIM_AC_OPTION_RESERVED_BITS(1) diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 9f3fad3..170d679 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4 index 02e3ea4..6032284 100644 --- a/sim/mn10300/aclocal.m4 +++ b/sim/mn10300/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_reserved_bits.m4]) diff --git a/sim/mn10300/configure b/sim/mn10300/configure index e7155d6..8efbbc0 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_reserved_bits="1" # Check whether --enable-sim-reserved-bits was given. if test "${enable_sim_reserved_bits+set}" = set; then : diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac index 1083c06..e531be9 100644 --- a/sim/mn10300/configure.ac +++ b/sim/mn10300/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_RESERVED_BITS SIM_AC_OPTION_BITSIZE(32,31) SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop) diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 00c1753..4c7ee51 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * Makefile.in: Change @MAINTAINER_MODE_TRUE@ to $(MAINT). * aclocal.m4, configure: Regenerate. diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/moxie/aclocal.m4 +++ b/sim/moxie/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/moxie/configure b/sim/moxie/configure index d857477..b62feb4 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/moxie/configure.ac +++ b/sim/moxie/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index c549a0d..7902b88 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/msp430/aclocal.m4 +++ b/sim/msp430/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/msp430/configure b/sim/msp430/configure index d857477..b62feb4 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/msp430/configure.ac b/sim/msp430/configure.ac index 4f2c0ac..7d86d83 100644 --- a/sim/msp430/configure.ac +++ b/sim/msp430/configure.ac @@ -21,6 +21,4 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 948ae7b..6826444 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index 4b13aea..c7a6371 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) diff --git a/sim/or1k/configure b/sim/or1k/configure index 77e90f6..4141f80 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -1687,8 +1687,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - wire_word_bitsize="32" wire_word_msb="31" wire_address_bitsize="32" diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac index f77a733..c72c80c 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_BITSIZE([32], [31], [32]) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL([or1200]) diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index 02128cb..7be5775 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/pru/aclocal.m4 +++ b/sim/pru/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/pru/configure b/sim/pru/configure index d857477..b62feb4 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/pru/configure.ac b/sim/pru/configure.ac index 8e9577c..ef9f475 100644 --- a/sim/pru/configure.ac +++ b/sim/pru/configure.ac @@ -21,6 +21,4 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog index 9ef700f..2bef5e8 100644 --- a/sim/riscv/ChangeLog +++ b/sim/riscv/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4 index 68f47bb..14d9979 100644 --- a/sim/riscv/aclocal.m4 +++ b/sim/riscv/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) diff --git a/sim/riscv/configure b/sim/riscv/configure index 97e09b1..0710edf 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -1684,8 +1684,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Select the default model for the target. riscv_model= case "${target}" in diff --git a/sim/riscv/configure.ac b/sim/riscv/configure.ac index e866c8f..01afe51 100644 --- a/sim/riscv/configure.ac +++ b/sim/riscv/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - # Select the default model for the target. riscv_model= case "${target}" in diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 4502c06..5937c25 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/rl78/aclocal.m4 +++ b/sim/rl78/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/rl78/configure b/sim/rl78/configure index d857477..b62feb4 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac index 4f2c0ac..7d86d83 100644 --- a/sim/rl78/configure.ac +++ b/sim/rl78/configure.ac @@ -21,6 +21,4 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index 62784dc..e27cba4 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/rx/aclocal.m4 +++ b/sim/rx/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/rx/configure b/sim/rx/configure index d8e5e4c..e5fbf24 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -1683,8 +1683,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Check whether --enable-cycle-accurate was given. if test "${enable_cycle_accurate+set}" = set; then : enableval=$enable_cycle_accurate; case "${enableval}" in diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac index b4881f8..78fc33b 100644 --- a/sim/rx/configure.ac +++ b/sim/rx/configure.ac @@ -21,8 +21,6 @@ dnl AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - AC_ARG_ENABLE(cycle-accurate, [AS_HELP_STRING([--disable-cycle-accurate], [Disable cycle accurate simulation (faster runtime)])], diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 26b4e21..5db5bc7 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4 index b002c85..1e96f10 100644 --- a/sim/sh/aclocal.m4 +++ b/sim/sh/aclocal.m4 @@ -12,6 +12,5 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/sh/configure b/sim/sh/configure index d857477..b62feb4 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -1680,8 +1680,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - hardware="cfi core pal glue " sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac index 08bf6ff..99370b3 100644 --- a/sim/sh/configure.ac +++ b/sim/sh/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OUTPUT diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 6884c95..9256eb4 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,5 +1,10 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_COMMON): Delete. + * aclocal.m4, configure: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. * configure: Regenerate. diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4 index 02e3ea4..6032284 100644 --- a/sim/v850/aclocal.m4 +++ b/sim/v850/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_reserved_bits.m4]) diff --git a/sim/v850/configure b/sim/v850/configure index ffda16d..c4fbe28 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -1686,8 +1686,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - default_sim_reserved_bits="1" # Check whether --enable-sim-reserved-bits was given. if test "${enable_sim_reserved_bits+set}" = set; then : diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac index c3cd646..74eb1fa 100644 --- a/sim/v850/configure.ac +++ b/sim/v850/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_COMMON - SIM_AC_OPTION_RESERVED_BITS SIM_AC_OPTION_BITSIZE(32,31) |