From 347fe5bb868b7383d4f6942894b31ecf1da6894e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 9 Jan 2016 05:58:01 -0500 Subject: 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. --- sim/sh64/ChangeLog | 5 +++ sim/sh64/configure | 86 +++++++++++++++++++++------------------------------ sim/sh64/configure.ac | 1 - 3 files changed, 41 insertions(+), 51 deletions(-) (limited to 'sim/sh64') diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 0de22fc..b90bc5f 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger + * configure: Regenerate. 2016-01-10 Mike Frysinger diff --git a/sim/sh64/configure b/sim/sh64/configure index e236b7d..21a4643 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -755,6 +755,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -762,7 +763,6 @@ enable_sim_alignment enable_sim_scache enable_sim_default_model enable_sim_environment -enable_sim_inline enable_cgen_maint enable_sim_hardware ' @@ -1408,6 +1408,8 @@ Optional Features: --enable-sim-trace=opts Enable tracing of simulated programs --enable-sim-profile=opts Enable profiling flags + --enable-sim-inline=inlines + Specify which functions should be inlined --enable-sim-endian=endian Specify target byte endian orientation --enable-sim-alignment=align @@ -1420,8 +1422,6 @@ Optional Features: --enable-sim-environment=environment Specify mixed, user, virtual or operating environment - --enable-sim-inline=inlines - Specify which functions should be inlined --enable-cgen-maint=DIR build cgen generated files --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -4017,7 +4017,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12853,7 +12852,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12856 "configure" +#line 12855 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12959,7 +12958,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12962 "configure" +#line 12961 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13313,6 +13312,37 @@ 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 --with-pkgversion was given. if test "${with_pkgversion+set}" = set; then : @@ -13561,50 +13591,6 @@ else fi -default_sim_inline="" -# 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$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 -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac index c1fb783..818af12 100644 --- a/sim/sh64/configure.ac +++ b/sim/sh64/configure.ac @@ -10,7 +10,6 @@ SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(sh5) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(yes,"","") -- cgit v1.1