sim: move sim-inline to the common code
authorMike Frysinger <vapier@gentoo.org>
Wed, 16 Jun 2021 02:45:07 +0000 (22:45 -0400)
committerMike Frysinger <vapier@gentoo.org>
Sun, 20 Jun 2021 04:12:11 +0000 (00:12 -0400)
This will allow us to build the common code with the same inline
settings as the arch subdirs, and only do the test once.

108 files changed:
sim/ChangeLog
sim/Makefile.am
sim/Makefile.in
sim/aarch64/ChangeLog
sim/aarch64/aclocal.m4
sim/aarch64/configure
sim/aclocal.m4
sim/arch-subdir.mk.in
sim/arm/ChangeLog
sim/arm/aclocal.m4
sim/arm/configure
sim/avr/ChangeLog
sim/avr/aclocal.m4
sim/avr/configure
sim/bfin/ChangeLog
sim/bfin/aclocal.m4
sim/bfin/configure
sim/bpf/ChangeLog
sim/bpf/aclocal.m4
sim/bpf/configure
sim/common/ChangeLog
sim/common/Make-common.in
sim/configure
sim/configure.ac
sim/cr16/ChangeLog
sim/cr16/aclocal.m4
sim/cr16/configure
sim/cris/ChangeLog
sim/cris/aclocal.m4
sim/cris/configure
sim/d10v/ChangeLog
sim/d10v/aclocal.m4
sim/d10v/configure
sim/erc32/ChangeLog
sim/erc32/aclocal.m4
sim/erc32/configure
sim/example-synacor/ChangeLog
sim/example-synacor/aclocal.m4
sim/example-synacor/configure
sim/frv/ChangeLog
sim/frv/aclocal.m4
sim/frv/configure
sim/ft32/ChangeLog
sim/ft32/aclocal.m4
sim/ft32/configure
sim/h8300/ChangeLog
sim/h8300/aclocal.m4
sim/h8300/configure
sim/iq2000/ChangeLog
sim/iq2000/aclocal.m4
sim/iq2000/configure
sim/lm32/ChangeLog
sim/lm32/aclocal.m4
sim/lm32/configure
sim/m32c/ChangeLog
sim/m32c/aclocal.m4
sim/m32c/configure
sim/m32r/ChangeLog
sim/m32r/aclocal.m4
sim/m32r/configure
sim/m4/sim_ac_common.m4
sim/m4/sim_ac_option_inline.m4
sim/m68hc11/ChangeLog
sim/m68hc11/aclocal.m4
sim/m68hc11/configure
sim/mcore/ChangeLog
sim/mcore/aclocal.m4
sim/mcore/configure
sim/microblaze/ChangeLog
sim/microblaze/aclocal.m4
sim/microblaze/configure
sim/mips/ChangeLog
sim/mips/aclocal.m4
sim/mips/configure
sim/mn10300/ChangeLog
sim/mn10300/aclocal.m4
sim/mn10300/configure
sim/moxie/ChangeLog
sim/moxie/aclocal.m4
sim/moxie/configure
sim/msp430/ChangeLog
sim/msp430/aclocal.m4
sim/msp430/configure
sim/or1k/ChangeLog
sim/or1k/aclocal.m4
sim/or1k/configure
sim/ppc/ChangeLog
sim/ppc/Makefile.in
sim/ppc/configure
sim/ppc/configure.ac
sim/pru/ChangeLog
sim/pru/aclocal.m4
sim/pru/configure
sim/riscv/ChangeLog
sim/riscv/aclocal.m4
sim/riscv/configure
sim/rl78/ChangeLog
sim/rl78/aclocal.m4
sim/rl78/configure
sim/rx/ChangeLog
sim/rx/aclocal.m4
sim/rx/configure
sim/sh/ChangeLog
sim/sh/aclocal.m4
sim/sh/configure
sim/v850/ChangeLog
sim/v850/aclocal.m4
sim/v850/configure

index c22f9b31464f23b45fbd982bf0672f6892a87336..722d91e1b844679cda01c0784795d9dfe60f44cb 100644 (file)
@@ -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.
index 8d5311456860bc73d822cea198a73e76fa5acb5d..1c5b276d4e9759dad71ede45b3fc0e452d6bad76 100644 (file)
@@ -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 $@
index 9ba3471d34521c45ce3da6e28a204559f256e75f..925e767067367cf2fb18d4ace21ee434c4330244 100644 (file)
@@ -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 $@
 
index 074b9672fb903bda8c99f6d3c45910b8ec8b0695..1467a07bbf9aed7e2adeb268c387079babc1c7e4 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 5ebbbb6dee836be5ca813a62e38ed7a3899b9444..6513ae23fe920c4dfe84f743726911e75a89b315 100644 (file)
@@ -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])
index 5f59f8808073e9685cc6a9477cd4deb98258d0e0..4352f92c711506431d117deefdd7c76e8d0e2aa1 100644 (file)
@@ -53,3 +53,5 @@ INTL_CFLAGS = @INCINTL@
 COMMON_LIBS = @LIBS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
+
+SIM_INLINE = @SIM_INLINE@
index d10ece97179e54e27eba510e16ebc15d5982c684..ad31dd250cee8fbddd6eb735c2c55c0389ff2949 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index cc12e5f77127486b465906b67387336ce05710f5..9637f7527d0fc69fadd8065c4bdbf485237350e0 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 2bc4d225798578cfac215e15251e27193eb9f62d..72a4acfaa82f56330de02848f103962f24a048ff 100644 (file)
@@ -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.
index 0bc787139e5169b3ff5754d16104632f9032a119..70b28979297e2c6bc6df6fbd623cea06932642ac 100644 (file)
@@ -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])
index c81ff4223494f42a09d6898f4f022a46f04b0f23..afbed8eb148d531803f354a0ab6c4dd0c8d5c7a7 100755 (executable)
@@ -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.
index 00dc5ecd5508c20188dbca3d848d652481337973..fa4346dec95cbbbccb3fc6e3c4fe2a9c187d26d7 100644 (file)
@@ -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.
index 3290e3b10ba831bebdbfde2efc4707660be5cf9e..e511ab35eb5094b4494090fa8c9e38d4eca23106 100644 (file)
@@ -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])
index 50f993973e631eadc0d3f967bc60005d74811a3b..57c85c944d645fdd6890e91bbf2a60561d33f8b5 100755 (executable)
@@ -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=""
index cda7b953540c3085c06b4a084ed345ec37080f86..a36793914e6e9b7ef1e20509f5fc71ea660f0105 100644 (file)
@@ -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.
index 63a0248f3cfb18ebb1fe12bae45a32e20ef109f9..b8116d8996ff4941a47500d5cc5193d46b61bcf0 100644 (file)
@@ -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)
index 9f84c4fd34dba6e6b02051ae6c3a6076af9a08db..7563ad649be69db2f160e0e583f03ac613b4e3cd 100755 (executable)
@@ -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"
index 33c7aca60f5aecc10af9ac1007f3050a697ec4be..a3f02a78e9a7fdc01a906088cc78b3088bd3c7b7 100644 (file)
@@ -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
index 55799cd81ecea7d8e3b7835048021212e5b4b15a..54a8ce82d035ee84525e65af8891ea7be2cdc82c 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index fed7739c4b05423614882a289436602e684853ec..713446dc03c8ead235807f1e10eddd2179a1201e 100644 (file)
@@ -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.
index 24702ab860979fa1c51c3d639990c47477eb2fe1..50fcc1f14c8a9ba5d5cbabedc42b32aae46ef33e 100644 (file)
@@ -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])
index ec454728e2ef063ae918b95db9819ed93b3b2e0f..d4af2235a6f7fdc988bfb10cd3d8ec977682ea55 100755 (executable)
@@ -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.
index 0c31bd8710822e30161d57cf97d82044f709ed58..2990f4e6d39632347df76957b1e659a0b45e1a65 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 25a7980ddee8e5f673826aef6e95f9ac9e996e2f..38da15a064cfa488485561686105ad1de05ec526 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index c7ed91dff6f4940c6acdd1ca9adb6a0f883df5b6..0cf8081a7a75e342a67642ce6605d6c8a013a0b5 100755 (executable)
@@ -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'
index eed6bf877654de9a6532796da1bb417447dda942..9ec4923a39f73fdca1d82cd90b716e03333d5fed 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index e0fe8b343138b1cf0a847371194fa91f625ba5d5..084012dcdb465287fe3fdf684df7700692193f6d 100644 (file)
@@ -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.
index 24702ab860979fa1c51c3d639990c47477eb2fe1..50fcc1f14c8a9ba5d5cbabedc42b32aae46ef33e 100644 (file)
@@ -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])
index c9c5392f5400225fcc1b84266cfe18f8ef20aa59..2da2c50183de5855074e11e9b95da0330ff2d4fe 100755 (executable)
@@ -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.
index c64bfa52fcdec3ab7f2436b3d92e7f650c3f0b53..d0a9f0cfe9a2dfd4814da5dc8ee85cf2c292d592 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index a23fc7c73e6c2cf344f6d769ae9099713ce05571..1c2b5fc557b65e76bcaa82c17a9d63d8a0a785b4 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index cc3926133d7027f6639ef115d19fc33b74bdf13a..c2b8dd6bd0bb21b2fff5e5ed6e6242cc0af4c1a2 100644 (file)
@@ -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.
index 24702ab860979fa1c51c3d639990c47477eb2fe1..50fcc1f14c8a9ba5d5cbabedc42b32aae46ef33e 100644 (file)
@@ -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])
index 624623a5e432f2418e18ad738614abb3fdc15e15..3575e5d0993fb423b3f813306df23f5c69ecad05 100755 (executable)
@@ -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.
index db372a9462c31ecf02159a8e12cd476b18556666..41f800d6c3a43d27a9f12e88b71ce5e3850fc06a 100644 (file)
@@ -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.
index 24702ab860979fa1c51c3d639990c47477eb2fe1..50fcc1f14c8a9ba5d5cbabedc42b32aae46ef33e 100644 (file)
@@ -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])
index a085bdc504e04b2858de791bbe43909afdf90e48..3404115d100d6b3d5464e8ae0ae88c7b2e55524d 100755 (executable)
@@ -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.
index 34a48a9aa5ba1a2efebc46ead39005ee90911685..1c60ffc514c8a9fc21713845b2ca1925a957abbe 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 49972fa2dbf94d993d6a235d0d9f99cfb169402e..0fabbfc7355ba1fb13483785c8968650081aa027 100644 (file)
@@ -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.
index 24702ab860979fa1c51c3d639990c47477eb2fe1..50fcc1f14c8a9ba5d5cbabedc42b32aae46ef33e 100644 (file)
@@ -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])
index 8caa23260b080b245d518c7d2fc441ca58cd0e34..cdfcddd011d580b3c6fba6f4f6eb9ab0eea564ae 100755 (executable)
@@ -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.
index 26d0eefdc35c75228ca5ef2b9b6b046a730f5f4a..658789581471e98f90f02d8ec4a394413638e42e 100644 (file)
@@ -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
index 42221bc467239ef9dbad3065937a13d72b277ef0..90d9cfaa5903eb996a4edf448f463c217683de0e 100644 (file)
@@ -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)
index ee7d48cc0c6d33b11f534290690a64fb056cc22b..b290b44894777fe300506d18a07db7cd36e42a57 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 2b3a6a1b8f5abda3d622b8e4cd143c2c823c0a34..f30123d5f0b007b70e1d0ba487da1bfb7361aaca 100755 (executable)
@@ -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"
index ee1aa0e1a24dcc6c3d4b19d39d905e8382f956ef..b0cb3b1f13f9a547e3c9ff701baf85843b5687ee 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 6479ea434768900e43131307dabe70f94cf43327..10200374b2809ced12b07bec57ef2ef38b9d5e30 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index fd7b3f7d9723aedf525fb3b908492edc40abb863..93b8fcf33c3dd80b055ecffbefee7e1d04e6dee2 100644 (file)
@@ -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.
index b62627aa0c3a1b202537349d2f07efdcdae5e34a..bd99043f9478ba2d1602cd1112a0532c81418905 100644 (file)
@@ -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])
index 3a67a68c3bbdf5112b3f9509158e7824145c7e8f..67a17c344104b8ac83ecf67ebc5a987718f35f72 100755 (executable)
@@ -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.
index 0d5ca74bb0790ee187106ac9bb5f9aecc6d3785a..9f3fad3b23742cbce75c76f57682fc596d5f8a48 100644 (file)
@@ -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.
index bf2fe61fd684d935cb6242e6b2d456e71e92d7db..1d12f32abe2dab74c8c3f1f54d233085cc90f1f0 100644 (file)
@@ -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])
index bb9e79accb5eacb1201bde6e1488f9345ec3060f..c2577c763896427fed936b3f28d452149bc861a6 100755 (executable)
@@ -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.
index 10d0086a978a8b012167ffb432432782744e20ad..1fa55d999f186f43cec9cb983e03e7ed6cbdcba6 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 6c8661dfbaf7af0374d0784c682596ea22099299..c549a0dad91426d2fc145d5ed7d280bacc0cbd04 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 02adfdbf23c10482e651647e98a50bb9a286e3f5..3783520c9bc663d62a7ae047dad806841624b3f1 100644 (file)
@@ -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.
index 3290e3b10ba831bebdbfde2efc4707660be5cf9e..e511ab35eb5094b4494090fa8c9e38d4eca23106 100644 (file)
@@ -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])
index 3dafbd75782c1ebc69d5ed4da7cb51ca1edf151f..95ce8b8e21a0adb97d57a3d7b297311dd9d20293 100755 (executable)
@@ -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"
index ec248cb48ddbf347b76d31bb14cfb375a445af2d..b41d20230d95d52a17e643cedc83c109a05c0232 100644 (file)
@@ -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
index a621e994011904b34dbf43f2292c9fc4cba01f05..964d667d99d5cf0ab499f0c7e83783fdcb1cd629 100644 (file)
@@ -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@
index 6228d17ddea948adebbda7f3d4ea76437b2fc2b7..a3b7b30bf22eae3fd0ee36a5721b060392a74f0e 100755 (executable)
@@ -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"
index 19dbd77bda917342a0e6dd15eb54b35a295e99f4..30952f30a4afc1e27c4624e520de2acc2ae41a84 100644 (file)
@@ -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)
index 3dfe435cccc4a89284934695d45b3080ab72f992..02128cb3682629644fa6fcceee2b2c3cc0ae3114 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 813a2a8b55ce3c38abdd71f83d336fe415610d0a..9ef700f9b600dd5f189f7b2e4aa1e1ebc46a4806 100644 (file)
@@ -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.
index 3ef6ace5780d7080f3ea5da294775d3b69ca7e01..9d2e2cbc1502d1c568bbfedad19cf70328a000f9 100644 (file)
@@ -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])
index 7330cb1b47a19d94dddb65458737bec13a833647..05a700d17da0888d881e7ede7a029136fcab50b8 100755 (executable)
@@ -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
index 8f93b61a882bbdca10cc4f7aefac989ce3b77df1..4502c0608127359b9dade35debaf1edb0b1e8dd1 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index c73a8f43cd6e38215b2a27323290e406fc9bd45e..62784dc9fd5d45843955feee4d900c4cf7603d8a 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 5011722cccbd340ab59f334b463493effea78fec..4b9a837e04fed2889e0ae601a68cf8fd23568c8c 100755 (executable)
@@ -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
index aff720f4cc9e16ee2701a49e4d1ea9f67f26172f..26b4e2121717893d88e5e624979f4c2e958627f6 100644 (file)
@@ -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.
index 680d267d399113ca6fd5437dc97b4c0c81a03384..81cb1911a8368e57d9c540be4dbea6b048e6d404 100644 (file)
@@ -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])
index 653a48fc47d2f6e34a5dc8938f56f469b200fdd2..85cb186840d0074967f3f102639175bde6c8db1f 100755 (executable)
@@ -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"
index 7ce458ab9b02f1ea687fcb2522648cdef20aa9a6..6884c950a3951bf839eaa94ed0855f84ad001c59 100644 (file)
@@ -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.
index bf2fe61fd684d935cb6242e6b2d456e71e92d7db..1d12f32abe2dab74c8c3f1f54d233085cc90f1f0 100644 (file)
@@ -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])
index fb857041572bffcf86b2280f2633e0f432706284..ffdd67514e98877d81707184111196d91abf03ef 100755 (executable)
@@ -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.