[binutils-gdb] sim: move sim-inline to the common code
Michael Frysinger
vapier@sourceware.org
Sun Jun 20 04:16:53 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d73f39ee4309d340b97974e49f34e24b8b93fc61
commit d73f39ee4309d340b97974e49f34e24b8b93fc61
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Jun 15 22:45:07 2021 -0400
sim: move sim-inline to the common code
This will allow us to build the common code with the same inline
settings as the arch subdirs, and only do the test once.
Diff:
---
sim/ChangeLog | 9 +++++++++
sim/Makefile.am | 4 +++-
sim/Makefile.in | 4 +++-
sim/aarch64/ChangeLog | 5 +++++
sim/aarch64/aclocal.m4 | 1 -
sim/aarch64/configure | 35 -----------------------------------
sim/aclocal.m4 | 1 +
sim/arch-subdir.mk.in | 2 ++
sim/arm/ChangeLog | 5 +++++
sim/arm/aclocal.m4 | 1 -
sim/arm/configure | 35 -----------------------------------
sim/avr/ChangeLog | 5 +++++
sim/avr/aclocal.m4 | 1 -
sim/avr/configure | 35 -----------------------------------
sim/bfin/ChangeLog | 5 +++++
sim/bfin/aclocal.m4 | 1 -
sim/bfin/configure | 35 -----------------------------------
sim/bpf/ChangeLog | 5 +++++
sim/bpf/aclocal.m4 | 1 -
sim/bpf/configure | 35 -----------------------------------
sim/common/ChangeLog | 4 ++++
sim/common/Make-common.in | 1 -
sim/configure | 41 +++++++++++++++++++++++++++++++++++++++--
sim/configure.ac | 1 +
sim/cr16/ChangeLog | 5 +++++
sim/cr16/aclocal.m4 | 1 -
sim/cr16/configure | 35 -----------------------------------
sim/cris/ChangeLog | 5 +++++
sim/cris/aclocal.m4 | 1 -
sim/cris/configure | 35 -----------------------------------
sim/d10v/ChangeLog | 5 +++++
sim/d10v/aclocal.m4 | 1 -
sim/d10v/configure | 35 -----------------------------------
sim/erc32/ChangeLog | 5 +++++
sim/erc32/aclocal.m4 | 1 -
sim/erc32/configure | 35 -----------------------------------
sim/example-synacor/ChangeLog | 5 +++++
sim/example-synacor/aclocal.m4 | 1 -
sim/example-synacor/configure | 35 -----------------------------------
sim/frv/ChangeLog | 5 +++++
sim/frv/aclocal.m4 | 1 -
sim/frv/configure | 35 -----------------------------------
sim/ft32/ChangeLog | 5 +++++
sim/ft32/aclocal.m4 | 1 -
sim/ft32/configure | 35 -----------------------------------
sim/h8300/ChangeLog | 5 +++++
sim/h8300/aclocal.m4 | 1 -
sim/h8300/configure | 35 -----------------------------------
sim/iq2000/ChangeLog | 5 +++++
sim/iq2000/aclocal.m4 | 1 -
sim/iq2000/configure | 35 -----------------------------------
sim/lm32/ChangeLog | 5 +++++
sim/lm32/aclocal.m4 | 1 -
sim/lm32/configure | 35 -----------------------------------
sim/m32c/ChangeLog | 5 +++++
sim/m32c/aclocal.m4 | 1 -
sim/m32c/configure | 35 -----------------------------------
sim/m32r/ChangeLog | 5 +++++
sim/m32r/aclocal.m4 | 1 -
sim/m32r/configure | 35 -----------------------------------
sim/m4/sim_ac_common.m4 | 2 --
sim/m4/sim_ac_option_inline.m4 | 11 ++++++-----
sim/m68hc11/ChangeLog | 5 +++++
sim/m68hc11/aclocal.m4 | 1 -
sim/m68hc11/configure | 35 -----------------------------------
sim/mcore/ChangeLog | 5 +++++
sim/mcore/aclocal.m4 | 1 -
sim/mcore/configure | 35 -----------------------------------
sim/microblaze/ChangeLog | 5 +++++
sim/microblaze/aclocal.m4 | 1 -
sim/microblaze/configure | 35 -----------------------------------
sim/mips/ChangeLog | 5 +++++
sim/mips/aclocal.m4 | 1 -
sim/mips/configure | 35 -----------------------------------
sim/mn10300/ChangeLog | 5 +++++
sim/mn10300/aclocal.m4 | 1 -
sim/mn10300/configure | 35 -----------------------------------
sim/moxie/ChangeLog | 5 +++++
sim/moxie/aclocal.m4 | 1 -
sim/moxie/configure | 35 -----------------------------------
sim/msp430/ChangeLog | 5 +++++
sim/msp430/aclocal.m4 | 1 -
sim/msp430/configure | 35 -----------------------------------
sim/or1k/ChangeLog | 5 +++++
sim/or1k/aclocal.m4 | 1 -
sim/or1k/configure | 35 -----------------------------------
sim/ppc/ChangeLog | 6 ++++++
sim/ppc/Makefile.in | 2 +-
sim/ppc/configure | 42 ------------------------------------------
sim/ppc/configure.ac | 36 ------------------------------------
sim/pru/ChangeLog | 5 +++++
sim/pru/aclocal.m4 | 1 -
sim/pru/configure | 35 -----------------------------------
sim/riscv/ChangeLog | 5 +++++
sim/riscv/aclocal.m4 | 1 -
sim/riscv/configure | 35 -----------------------------------
sim/rl78/ChangeLog | 5 +++++
sim/rl78/aclocal.m4 | 1 -
sim/rl78/configure | 35 -----------------------------------
sim/rx/ChangeLog | 5 +++++
sim/rx/aclocal.m4 | 1 -
sim/rx/configure | 35 -----------------------------------
sim/sh/ChangeLog | 5 +++++
sim/sh/aclocal.m4 | 1 -
sim/sh/configure | 35 -----------------------------------
sim/v850/ChangeLog | 5 +++++
sim/v850/aclocal.m4 | 1 -
sim/v850/configure | 35 -----------------------------------
108 files changed, 230 insertions(+), 1207 deletions(-)
diff --git a/sim/ChangeLog b/sim/ChangeLog
index c22f9b31464..722d91e1b84 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,12 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.am (AM_CPPFLAGS): Add $(SIM_INLINE).
+ * arch-subdir.mk.in (SIM_INLINE): Define.
+ * configure.ac: Call SIM_AC_OPTION_INLINE.
+ * m4/sim_ac_common.m4: Delete SIM_AC_OPTION_INLINE call.
+ * m4/sim_ac_option_inline.m4: Output SIM_INLINE.
+ * aclocal.m4, configure, Makefile.in: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* arch-subdir.mk.in (DTC): Define.
diff --git a/sim/Makefile.am b/sim/Makefile.am
index 8d531145686..1c5b276d4e9 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -36,7 +36,9 @@ DISTCLEANFILES =
MOSTLYCLEANFILES = core
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(srcroot)/include
+AM_CPPFLAGS = \
+ -I$(srcroot)/include \
+ $(SIM_INLINE)
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD)
LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 9ba3471d345..925e7670673 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -208,6 +208,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/m4/sim_ac_option_debug.m4 \
$(top_srcdir)/m4/sim_ac_option_endian.m4 \
$(top_srcdir)/m4/sim_ac_option_environment.m4 \
+ $(top_srcdir)/m4/sim_ac_option_inline.m4 \
$(top_srcdir)/m4/sim_ac_option_profile.m4 \
$(top_srcdir)/m4/sim_ac_option_stdio.m4 \
$(top_srcdir)/m4/sim_ac_option_trace.m4 \
@@ -700,6 +701,7 @@ REPORT_BUGS_TO = @REPORT_BUGS_TO@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SIM_INLINE = @SIM_INLINE@
SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
@@ -783,7 +785,7 @@ DISTCLEANFILES =
MOSTLYCLEANFILES = core $(am__append_4) site-srcdir.exp testrun.log \
testrun.sum
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(srcroot)/include -I$(srcdir)/common
+AM_CPPFLAGS = -I$(srcroot)/include $(SIM_INLINE) -I$(srcdir)/common
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD)
LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 074b9672fb9..1467a07bbf9 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/aclocal.m4 b/sim/aclocal.m4
index 5ebbbb6dee8..6513ae23fe9 100644
--- a/sim/aclocal.m4
+++ b/sim/aclocal.m4
@@ -1184,6 +1184,7 @@ m4_include([m4/sim_ac_option_assert.m4])
m4_include([m4/sim_ac_option_debug.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_profile.m4])
m4_include([m4/sim_ac_option_stdio.m4])
m4_include([m4/sim_ac_option_trace.m4])
diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 5f59f880807..4352f92c711 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -53,3 +53,5 @@ INTL_CFLAGS = @INCINTL@
COMMON_LIBS = @LIBS@
WARN_CFLAGS = @WARN_CFLAGS@
WERROR_CFLAGS = @WERROR_CFLAGS@
+
+SIM_INLINE = @SIM_INLINE@
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index d10ece97179..ad31dd250ce 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/arm/configure b/sim/arm/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index cc12e5f7712..9637f7527d0 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/avr/configure b/sim/avr/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 2bc4d225798..72a4acfaa82 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index 0bc787139e5..70b28979297 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -103,5 +103,4 @@ 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_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/bfin/configure b/sim/bfin/configure
index c81ff422349..afbed8eb148 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -642,7 +642,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -651,7 +650,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_default_model
enable_sim_hardware
'
@@ -1278,8 +1276,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-default-model=model
Specify default model to simulate
--enable-sim-hardware=LIST
@@ -1846,37 +1842,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_default_model="bf537"
# Check whether --enable-sim-default-model was given.
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 00dc5ecd550..fa4346dec95 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index 3290e3b10ba..e511ab35eb5 100644
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -104,6 +104,5 @@ 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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/bpf/configure b/sim/bpf/configure
index 50f993973e6..57c85c944d6 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -632,7 +632,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -642,7 +641,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_bitsize
enable_sim_scache
enable_sim_default_model
@@ -1262,8 +1260,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
--enable-sim-scache=size
Specify simulator execution cache size
@@ -1731,37 +1727,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
wire_word_bitsize="64"
wire_word_msb=""
wire_address_bitsize=""
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index cda7b953540..a36793914e6 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-19 Mike Frysinger <vapier@gentoo.org>
+
+ * Make-common.in (SIM_INLINE): Delete.
+
2021-06-19 Simon Marchi <simon.marchi@polymtl.ca>
* sim-inline.h: Move UNUSED before TYPE.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 63a0248f3cf..b8116d8996f 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,7 +75,6 @@ SIM_FLOAT = @sim_float@
SIM_HW_CFLAGS = @sim_hw_cflags@
SIM_HW_OBJS = @sim_hw_objs@
SIM_HW = @sim_hw@
-SIM_INLINE = @sim_inline@
SIM_RESERVED_BITS = @sim_reserved_bits@
SIM_SCACHE = @sim_scache@
SIM_WARN_CFLAGS = $(WARN_CFLAGS)
diff --git a/sim/configure b/sim/configure
index 9f84c4fd34d..7563ad649be 100755
--- a/sim/configure
+++ b/sim/configure
@@ -638,6 +638,7 @@ enable_option_checking=no
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
+SIM_INLINE
SIM_ENABLE_IGEN_FALSE
SIM_ENABLE_IGEN_TRUE
subdirs
@@ -812,6 +813,7 @@ enable_sim_assert
enable_sim_debug
enable_sim_endian
enable_sim_environment
+enable_sim_inline
enable_sim_profile
enable_sim_stdio
enable_sim_trace
@@ -1507,6 +1509,8 @@ Optional Features:
--enable-sim-environment=environment
Specify mixed, user, virtual or operating
environment
+ --enable-sim-inline=inlines
+ Specify which functions should be inlined
--enable-sim-profile=opts
Enable profiling flags
--enable-sim-stdio Specify whether to use stdio for console
@@ -12032,7 +12036,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12035 "configure"
+#line 12039 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12138,7 +12142,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12141 "configure"
+#line 12145 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13845,6 +13849,39 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
$as_echo "$sim_environment" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sim inline settings" >&5
+$as_echo_n "checking sim inline settings... " >&6; }
+sim_inline="-DDEFAULT_INLINE=0"
+# Check whether --enable-sim-inline was given.
+if test "${enable_sim_inline+set}" = set; then :
+ enableval=$enable_sim_inline; 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_inline" >&5
+$as_echo "$sim_inline" >&6; }
+SIM_INLINE=$sim_inline
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
$as_echo_n "checking for sim profile settings... " >&6; }
profile="1"
diff --git a/sim/configure.ac b/sim/configure.ac
index 33c7aca60f5..a3f02a78e9a 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -121,6 +121,7 @@ SIM_AC_OPTION_ASSERT
SIM_AC_OPTION_DEBUG
SIM_AC_OPTION_ENDIAN
SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE
SIM_AC_OPTION_PROFILE
SIM_AC_OPTION_STDIO
SIM_AC_OPTION_TRACE
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 55799cd81ec..54a8ce82d03 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index fed7739c4b0..713446dc03c 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 24702ab8609..50fcc1f14c8 100644
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@@ -103,6 +103,5 @@ m4_include([../m4/sim_ac_common.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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/cris/configure b/sim/cris/configure
index ec454728e2e..d4af2235a6f 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -633,7 +633,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -642,7 +641,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_scache
enable_sim_hardware
enable_sim_default_model
@@ -1261,8 +1259,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-hardware=LIST
@@ -1729,37 +1725,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_scache="16384"
# Check whether --enable-sim-scache was given.
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 0c31bd87108..2990f4e6d39 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 25a7980ddee..38da15a064c 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/erc32/configure b/sim/erc32/configure
index c7ed91dff6f..0cf8081a7a7 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -645,7 +645,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -653,7 +652,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1275,8 +1273,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1872,37 +1868,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
# In the Cygwin environment, we need some additional flags.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index eed6bf87765..9ec4923a39f 100644
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index e0fe8b34313..084012dcdb4 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 24702ab8609..50fcc1f14c8 100644
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@@ -103,6 +103,5 @@ m4_include([../m4/sim_ac_common.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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/frv/configure b/sim/frv/configure
index c9c5392f540..2da2c50183d 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -634,7 +634,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -643,7 +642,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_scache
enable_sim_default_model
enable_cgen_maint
@@ -1263,8 +1261,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-default-model=model
@@ -1732,37 +1728,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_scache="16384"
# Check whether --enable-sim-scache was given.
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index c64bfa52fcd..d0a9f0cfe9a 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index a23fc7c73e6..1c2b5fc557b 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index cc3926133d7..c2b8dd6bd0b 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 24702ab8609..50fcc1f14c8 100644
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@@ -103,6 +103,5 @@ m4_include([../m4/sim_ac_common.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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 624623a5e43..3575e5d0993 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -633,7 +633,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -642,7 +641,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_scache
enable_sim_default_model
enable_cgen_maint
@@ -1261,8 +1259,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-default-model=model
@@ -1729,37 +1725,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_scache="16384"
# Check whether --enable-sim-scache was given.
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index db372a9462c..41f800d6c3a 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 24702ab8609..50fcc1f14c8 100644
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -103,6 +103,5 @@ m4_include([../m4/sim_ac_common.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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/lm32/configure b/sim/lm32/configure
index a085bdc504e..3404115d100 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -633,7 +633,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -642,7 +641,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_scache
enable_sim_default_model
enable_cgen_maint
@@ -1261,8 +1259,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-default-model=model
@@ -1729,37 +1725,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_scache="16384"
# Check whether --enable-sim-scache was given.
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 34a48a9aa5b..1c60ffc514c 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 49972fa2dbf..0fabbfc7355 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 24702ab8609..50fcc1f14c8 100644
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@@ -103,6 +103,5 @@ m4_include([../m4/sim_ac_common.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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 8caa23260b0..cdfcddd011d 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -635,7 +635,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -644,7 +643,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_scache
enable_sim_default_model
enable_cgen_maint
@@ -1263,8 +1261,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-scache=size
Specify simulator execution cache size
--enable-sim-default-model=model
@@ -1731,37 +1727,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_scache="16384"
# Check whether --enable-sim-scache was given.
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 26d0eefdc35..65878958147 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -24,6 +24,4 @@ AC_DEFUN([SIM_AC_COMMON],
dnl We don't use automake, but we still want to support
dnl --enable-maintainer-mode.
AM_MAINTAINER_MODE
-
-SIM_AC_OPTION_INLINE
]) dnl End of SIM_AC_COMMON
diff --git a/sim/m4/sim_ac_option_inline.m4 b/sim/m4/sim_ac_option_inline.m4
index 42221bc4672..90d9cfaa590 100644
--- a/sim/m4/sim_ac_option_inline.m4
+++ b/sim/m4/sim_ac_option_inline.m4
@@ -17,7 +17,8 @@ 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],
-[
+[dnl
+AC_MSG_CHECKING([sim inline settings])
sim_inline="-DDEFAULT_INLINE=m4_ifblank([$1],[0],[$1])"
AC_ARG_ENABLE(sim-inline,
[AS_HELP_STRING([--enable-sim-inline=inlines],
@@ -43,8 +44,8 @@ case "$enableval" in
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
+])dnl
+AC_MSG_RESULT([$sim_inline])
+SIM_INLINE=$sim_inline
+AC_SUBST(SIM_INLINE)
])
-AC_SUBST(sim_inline)
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index ee7d48cc0c6..b290b448947 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 2b3a6a1b8f5..f30123d5f0b 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue \
m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index ee1aa0e1a24..b0cb3b1f13f 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 6479ea43476..10200374b28 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index fd7b3f7d972..93b8fcf33c3 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index b62627aa0c3..bd99043f947 100644
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -103,6 +103,5 @@ 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])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_reserved_bits.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/mips/configure b/sim/mips/configure
index 3a67a68c3bb..67a17c34410 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -639,7 +639,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_reserved_bits
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -649,7 +648,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_reserved_bits
enable_sim_bitsize
enable_sim_float
@@ -1268,8 +1266,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-reserved-bits
Specify whether to check reserved bits in
instruction
@@ -1737,37 +1733,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_reserved_bits="1"
# Check whether --enable-sim-reserved-bits was given.
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 0d5ca74bb07..9f3fad3b237 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index bf2fe61fd68..1d12f32abe2 100644
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -102,6 +102,5 @@ m4_include([../../config/override.m4])
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_inline.m4])
m4_include([../m4/sim_ac_option_reserved_bits.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index bb9e79accb5..c2577c76389 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -630,7 +630,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_reserved_bits
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_reserved_bits
enable_sim_bitsize
enable_sim_hardware
@@ -1257,8 +1255,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-reserved-bits
Specify whether to check reserved bits in
instruction
@@ -1724,37 +1720,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
default_sim_reserved_bits="1"
# Check whether --enable-sim-reserved-bits was given.
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 10d0086a978..1fa55d999f1 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (DTC): Delete.
diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 6c8661dfbaf..c549a0dad91 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 02adfdbf23c..3783520c9bc 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index 3290e3b10ba..e511ab35eb5 100644
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -104,6 +104,5 @@ 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_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_option_scache.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 3dafbd75782..95ce8b8e21a 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -632,7 +632,6 @@ PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_scache
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -642,7 +641,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_bitsize
enable_sim_scache
enable_sim_default_model
@@ -1262,8 +1260,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
--enable-sim-scache=size
Specify simulator execution cache size
@@ -1731,37 +1727,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
wire_word_bitsize="32"
wire_word_msb="31"
wire_address_bitsize="32"
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index ec248cb48dd..b41d20230d9 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (INLINE_CFLAGS): Change to $(SIM_INLINE).
+ * configure.ac: Delete sim-inline logic.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Replace ALL_INLINE with ALL_C_INLINE and
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index a621e994011..964d667d99d 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -58,7 +58,7 @@ SHELL = /bin/sh
BISON = bison
MAKEINFO = makeinfo
-INLINE_CFLAGS = @sim_inline@
+INLINE_CFLAGS = $(SIM_INLINE)
SMP_CFLAGS = @sim_smp@
XOR_ENDIAN_CFLAGS = @sim_xor_endian@
BITSIZE_CFLAGS = @sim_bitsize@
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 6228d17ddea..a3b7b30bf22 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -639,7 +639,6 @@ sim_bitsize
sim_igen_smp
sim_smp
sim_xor_endian
-sim_inline
sim_pk_obj
sim_pk_src
sim_hw_obj
@@ -718,7 +717,6 @@ enable_sim_float
enable_sim_hardware
enable_sim_hostbitsize
enable_sim_icache
-enable_sim_inline
enable_sim_jump
enable_sim_line_nr
enable_sim_model
@@ -1359,7 +1357,6 @@ Optional Features:
--enable-sim-hardware=list Specify the hardware to be included in the build.
--enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).
--enable-sim-icache=size Specify instruction-decode cache size and type.
- --enable-sim-inline=inlines Specify which functions should be inlined.
--enable-sim-jump Jump between semantic code (instead of call/return).
--enable-sim-line-nr=opts Generate extra CPP code that references source rather than generated code
--enable-sim-model=which Specify PowerPC to model.
@@ -3305,44 +3302,6 @@ fi
fi
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-else
- if test x"$GCC" != ""; then
- sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
- if test x"$silent" != x"yes"; then
- echo "Setting inline flags = $sim_inline" 6>&1
- fi
-else
- sim_inline=""
-fi
-fi
-
-
# Check whether --enable-sim-jump was given.
if test "${enable_sim_jump+set}" = set; then :
enableval=$enable_sim_jump; case "${enableval}" in
@@ -4318,7 +4277,6 @@ fi
-
ac_config_files="$ac_config_files Makefile"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 19dbd77bda9..30952f30a4a 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -269,41 +269,6 @@ if test x"$silent" != x"yes"; then
fi])dnl
-AC_ARG_ENABLE(sim-inline,
-[ --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],[if test x"$GCC" != ""; then
- sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
- if test x"$silent" != x"yes"; then
- echo "Setting inline flags = $sim_inline" 6>&1
- fi
-else
- sim_inline=""
-fi])dnl
-
-
AC_ARG_ENABLE(sim-jump,
[ --enable-sim-jump Jump between semantic code (instead of call/return).],
[case "${enableval}" in
@@ -693,7 +658,6 @@ AC_SUBST(sim_hw_src)
AC_SUBST(sim_hw_obj)
AC_SUBST(sim_pk_src)
AC_SUBST(sim_pk_obj)
-AC_SUBST(sim_inline)
AC_SUBST(sim_xor_endian)
AC_SUBST(sim_smp)
AC_SUBST(sim_igen_smp)
diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index 3dfe435cccc..02128cb3682 100644
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/pru/configure b/sim/pru/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/pru/configure
+++ b/sim/pru/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index 813a2a8b55c..9ef700f9b60 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 3ef6ace5780..9d2e2cbc150 100644
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/aclocal.m4
@@ -103,5 +103,4 @@ 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])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/riscv/configure b/sim/riscv/configure
index 7330cb1b47a..05a700d17da 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -629,7 +629,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_default_model
enable_sim_bitsize
enable_sim_hardware
@@ -1257,8 +1255,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-default-model=model
Specify default model to simulate
--enable-sim-bitsize=N Specify target bitsize (32 or 64)
@@ -1723,37 +1719,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
# Select the default model for the target.
riscv_model=
case "${target}" in
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 8f93b61a882..4502c060812 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -1718,37 +1714,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index c73a8f43cd6..62784dc9fd5 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/rx/configure b/sim/rx/configure
index 5011722cccb..4b9a837e04f 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -632,7 +632,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -640,7 +639,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-enable_sim_inline
enable_cycle_accurate
enable_sim_hardware
'
@@ -1257,8 +1255,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-sim-inline=inlines
- Specify which functions should be inlined
--disable-cycle-accurate
Disable cycle accurate simulation (faster runtime)
--enable-sim-hardware=LIST
@@ -1722,37 +1718,6 @@ fi
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
- enableval=$enable_sim_inline; 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
-fi
-
-
-
# 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/sh/ChangeLog b/sim/sh/ChangeLog
index aff720f4cc9..26b4e212171 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-20 Mike Frysinger <vapier@gentoo.org>
+
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4
index 680d267d399..81cb1911a83 100644
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/aclocal.m4
@@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/sh/configure b/sim/sh/configure
index 653a48fc47d..85cb186840d 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@@ -639,7 +638,6 @@ ac_subst_file[...]
[diff truncated at 100000 bytes]
More information about the Gdb-cvs
mailing list