aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-01-09 05:58:01 -0500
committerMike Frysinger <vapier@gentoo.org>2016-01-10 03:36:32 -0500
commit347fe5bb868b7383d4f6942894b31ecf1da6894e (patch)
tree4b72385d8aefd9d4e35121faa027755c08913a82 /sim/common
parent0dc73ef7c304e6ffc9ce43b2131c77553a74e1d4 (diff)
downloadgdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.zip
gdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.tar.gz
gdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.tar.bz2
sim: allow the inline configure option everywhere
Currently ports have to call SIM_AC_OPTION_INLINE explicitly in order to make the configure flag available. There's no real reason to not allow this flag for all ports, so move it to the common sim macro. This way we get standard behavior across all ports too.
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog6
-rw-r--r--sim/common/acinclude.m419
2 files changed, 10 insertions, 15 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 6f4f916..3e61937 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,11 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * acinclude.m4 (SIM_AC_COMMON): Call SIM_AC_OPTION_INLINE.
+ (SIM_AC_OPTION_INLINE): Rename default_sim_inline to sim_inline
+ and always set -DDEFAULT_INLINE. Delete AC_ARG_ENABLE 4th arg.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* acinclude.m4: Delete --enable-sim-regparm and sim_regparm,
and --enable-sim-stdcall and sim_stdcall.
* configure: Regenerate.
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 92eb265..0b027fd 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -223,6 +223,8 @@ if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl
AC_SUBST(sim_profile)
+SIM_AC_OPTION_INLINE
+
ACX_PKGVERSION([SIM])
ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
@@ -619,11 +621,10 @@ AC_SUBST(sim_hw)
dnl --enable-sim-inline is for users that wish to ramp up the simulator's
dnl performance by inlining functions.
-dnl Guarantee that unconfigured simulators do not do any inlining
-sim_inline="-DDEFAULT_INLINE=0"
+dnl Default sims to no inlining.
AC_DEFUN([SIM_AC_OPTION_INLINE],
[
-default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])"
+sim_inline="-DDEFAULT_INLINE=m4_ifblank([$1],[0],[$1])"
AC_ARG_ENABLE(sim-inline,
[AS_HELP_STRING([--enable-sim-inline=inlines],
[Specify which functions should be inlined])],
@@ -650,18 +651,6 @@ case "$enableval" in
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$cross_compiling" = "xno"; then
- if test x"$GCC" != "x" -a x"${default_sim_inline}" != "x" ; then
- sim_inline="${default_sim_inline}"
- if test x"$silent" != x"yes"; then
- echo "Setting inline flags = $sim_inline" 6>&1
- fi
- else
- sim_inline=""
- fi
-else
- sim_inline="-DDEFAULT_INLINE=0"
fi])dnl
])
AC_SUBST(sim_inline)