From 347fe5bb868b7383d4f6942894b31ecf1da6894e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 9 Jan 2016 05:58:01 -0500 Subject: [PATCH] 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/aarch64/ChangeLog | 5 +++ sim/aarch64/configure | 86 ++++++++++++++++--------------------- sim/aarch64/configure.ac | 1 - sim/arm/ChangeLog | 5 +++ sim/arm/configure | 86 ++++++++++++++++--------------------- sim/arm/configure.ac | 1 - sim/avr/ChangeLog | 5 +++ sim/avr/configure | 86 ++++++++++++++++--------------------- sim/avr/configure.ac | 1 - sim/bfin/ChangeLog | 5 +++ sim/bfin/configure | 86 ++++++++++++++++--------------------- sim/bfin/configure.ac | 1 - sim/common/ChangeLog | 6 +++ sim/common/acinclude.m4 | 19 ++------ sim/cr16/ChangeLog | 5 +++ sim/cr16/configure | 86 ++++++++++++++++--------------------- sim/cr16/configure.ac | 1 - sim/cris/ChangeLog | 5 +++ sim/cris/configure | 86 ++++++++++++++++--------------------- sim/cris/configure.ac | 1 - sim/d10v/ChangeLog | 5 +++ sim/d10v/configure | 86 ++++++++++++++++--------------------- sim/d10v/configure.ac | 1 - sim/erc32/ChangeLog | 4 ++ sim/erc32/configure | 39 +++++++++++++++-- sim/frv/ChangeLog | 4 ++ sim/frv/configure | 39 +++++++++++++++-- sim/ft32/ChangeLog | 5 +++ sim/ft32/configure | 86 ++++++++++++++++--------------------- sim/ft32/configure.ac | 1 - sim/h8300/ChangeLog | 4 ++ sim/h8300/configure | 39 +++++++++++++++-- sim/igen/ChangeLog | 4 ++ sim/igen/configure | 1 - sim/iq2000/ChangeLog | 5 +++ sim/iq2000/configure | 86 ++++++++++++++++--------------------- sim/iq2000/configure.ac | 1 - sim/lm32/ChangeLog | 4 ++ sim/lm32/configure | 39 +++++++++++++++-- sim/m32c/ChangeLog | 4 ++ sim/m32c/configure | 39 +++++++++++++++-- sim/m32r/ChangeLog | 5 +++ sim/m32r/configure | 86 ++++++++++++++++--------------------- sim/m32r/configure.ac | 1 - sim/m68hc11/ChangeLog | 5 +++ sim/m68hc11/configure | 82 +++++++++++++++-------------------- sim/m68hc11/configure.ac | 1 - sim/mcore/ChangeLog | 5 +++ sim/mcore/configure | 86 ++++++++++++++++--------------------- sim/mcore/configure.ac | 1 - sim/microblaze/ChangeLog | 5 +++ sim/microblaze/configure | 86 ++++++++++++++++--------------------- sim/microblaze/configure.ac | 1 - sim/mips/ChangeLog | 5 +++ sim/mips/configure | 82 +++++++++++++++-------------------- sim/mips/configure.ac | 1 - sim/mn10300/ChangeLog | 5 +++ sim/mn10300/configure | 86 ++++++++++++++++--------------------- sim/mn10300/configure.ac | 1 - sim/moxie/ChangeLog | 5 +++ sim/moxie/configure | 86 ++++++++++++++++--------------------- sim/moxie/configure.ac | 1 - sim/msp430/ChangeLog | 5 +++ sim/msp430/configure | 86 ++++++++++++++++--------------------- sim/msp430/configure.ac | 1 - sim/ppc/ChangeLog | 4 ++ sim/ppc/configure | 1 - sim/rl78/ChangeLog | 4 ++ sim/rl78/configure | 39 +++++++++++++++-- sim/rx/ChangeLog | 4 ++ sim/rx/configure | 39 +++++++++++++++-- sim/sh/ChangeLog | 5 +++ sim/sh/configure | 86 ++++++++++++++++--------------------- sim/sh/configure.ac | 1 - sim/sh64/ChangeLog | 5 +++ sim/sh64/configure | 86 ++++++++++++++++--------------------- sim/sh64/configure.ac | 1 - sim/v850/ChangeLog | 4 ++ sim/v850/configure | 39 +++++++++++++++-- 79 files changed, 1113 insertions(+), 1006 deletions(-) diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index ebae1cd032..19d49fb78a 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/aarch64/configure b/sim/aarch64/configure index d733a5bff4..afdfb55011 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13524,50 +13554,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac index 410131cf36..c6e32564c5 100644 --- a/sim/aarch64/configure.ac +++ b/sim/aarch64/configure.ac @@ -32,7 +32,6 @@ SIM_AC_OPTION_ENDIAN ## alignment instead. SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT,NONSTRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index e80bff54c0..3724c9b52f 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/arm/configure b/sim/arm/configure index 7e68943d49..a927f3210f 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac index ee83537862..6d5622e266 100644 --- a/sim/arm/configure.ac +++ b/sim/arm/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 44538f231e..49d6e1dd2c 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/avr/configure b/sim/avr/configure index b9b9b5303a..8978c0b327 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac index 4527f79587..184ccb53db 100644 --- a/sim/avr/configure.ac +++ b/sim/avr/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 723bfcb6bc..b220cb6d36 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/bfin/configure b/sim/bfin/configure index e95b232314..a9d9baf8fe 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -757,13 +757,13 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_default_model enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1416,6 +1416,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 @@ -1426,8 +1428,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4034,7 +4034,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12870,7 +12869,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12873 "configure" +#line 12872 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12976,7 +12975,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12979 "configure" +#line 12978 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13330,6 +13329,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 : @@ -13559,50 +13589,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index f0f7396eae..711cae451c 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_DEFAULT_MODEL(bf537) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OPTION_HARDWARE(yes,,\ bfin_cec \ diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 6f4f916206..3e619376d4 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2016-01-10 Mike Frysinger + + * 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 * acinclude.m4: Delete --enable-sim-regparm and sim_regparm, diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 92eb265d48..0b027fdc07 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) diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 4d73a3799c..68aab1bb53 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/cr16/configure b/sim/cr16/configure index 8ce80091e9..13fb762b4b 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac index c3cc9667d8..8ce247d7db 100644 --- a/sim/cr16/configure.ac +++ b/sim/cr16/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 25f140ed56..6330221c3f 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/cris/configure b/sim/cris/configure index 565ffeafac..6880ddb7f4 100755 --- a/sim/cris/configure +++ b/sim/cris/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 @@ -766,7 +767,6 @@ enable_sim_build_warnings enable_sim_hardware enable_sim_default_model enable_sim_environment -enable_sim_inline enable_cgen_maint ' ac_precious_vars='build_alias @@ -1411,6 +1411,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 @@ -1430,8 +1432,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 Optional Packages: @@ -4025,7 +4025,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12861,7 +12860,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12864 "configure" +#line 12863 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12967,7 +12966,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12970 "configure" +#line 12969 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13321,6 +13320,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 : @@ -13796,50 +13826,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/cris/configure.ac b/sim/cris/configure.ac index ee8a08d5e4..4e9455aa1f 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -17,7 +17,6 @@ SIM_AC_OPTION_HARDWARE(yes,,rv cris cris_900000xx) # The default model shouldn't matter as long as there's a BFD. SIM_AC_OPTION_DEFAULT_MODEL(crisv32) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT SIM_AC_OUTPUT diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 95ff51ef9b..01d86db93e 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/d10v/configure b/sim/d10v/configure index 7e68943d49..a927f3210f 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac index ee83537862..6d5622e266 100644 --- a/sim/d10v/configure.ac +++ b/sim/d10v/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 2d01898f87..d41e748f5b 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/erc32/configure b/sim/erc32/configure index a3af2ab77c..6ffb9162c6 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -754,6 +754,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl ' @@ -1399,6 +1400,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 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3991,7 +3994,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12827,7 +12829,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12830 "configure" +#line 12832 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12933,7 +12935,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12936 "configure" +#line 12938 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13287,6 +13289,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 : diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 7e509be602..598dc5273c 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/frv/configure b/sim/frv/configure index 748971a74b..269710ad71 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -756,6 +756,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -1409,6 +1410,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 @@ -4017,7 +4020,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12853,7 +12855,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 12858 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12959,7 +12961,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 12964 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13313,6 +13315,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 : diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index fb1210e1ff..a50c43e98d 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/ft32/configure b/sim/ft32/configure index e4d2bc7998..2f819f6a31 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac index 7ef618b22c..8aadb5f71c 100644 --- a/sim/ft32/configure.ac +++ b/sim/ft32/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 09f141a8ce..90bcf74a68 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/h8300/configure b/sim/h8300/configure index 7895bd762a..69fa692f2e 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -1399,6 +1400,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 @@ -3996,7 +3999,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12832,7 +12834,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12835 "configure" +#line 12837 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12938,7 +12940,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12941 "configure" +#line 12943 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13292,6 +13294,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 : diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index 2a47578be6..1bb33c648d 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -2,6 +2,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/igen/configure b/sim/igen/configure index 14f405821e..2264686817 100755 --- a/sim/igen/configure +++ b/sim/igen/configure @@ -3722,7 +3722,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 8bcf0db2af..596b84c09a 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 92a2843b0f..8e66d18f7e 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/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/iq2000/configure.ac b/sim/iq2000/configure.ac index f73aebcdfc..0d6b1164b3 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -10,7 +10,6 @@ SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(iq2000) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(yes,"","") diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index cf7ce4a9f9..a6325147c3 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/lm32/configure b/sim/lm32/configure index 46031796fc..20df44771c 100755 --- a/sim/lm32/configure +++ b/sim/lm32/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 @@ -1407,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 @@ -4014,7 +4017,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12850,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 12853 "configure" +#line 12855 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12956,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 12959 "configure" +#line 12961 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13310,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 : diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 1aeb75f663..0b42c84939 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/m32c/configure b/sim/m32c/configure index c083a20645..3ade132fc1 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_werror @@ -1400,6 +1401,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -3997,7 +4000,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12833,7 +12835,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12836 "configure" +#line 12838 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,7 +12941,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12942 "configure" +#line 12944 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13293,6 +13295,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 : diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index dc3530160c..142e129392 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/m32r/configure b/sim/m32r/configure index 3f632efd2e..f859fcf378 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -757,6 +757,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -764,7 +765,6 @@ enable_sim_alignment enable_sim_scache enable_sim_default_model enable_sim_environment -enable_sim_inline enable_cgen_maint enable_sim_hardware ' @@ -1410,6 +1410,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 @@ -1422,8 +1424,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. @@ -4019,7 +4019,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12855,7 +12854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12858 "configure" +#line 12857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12961,7 +12960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12964 "configure" +#line 12963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13315,6 +13314,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 : @@ -13563,50 +13593,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/m32r/configure.ac b/sim/m32r/configure.ac index d73f21b2ae..43950206fe 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -10,7 +10,6 @@ SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(m32r/d) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT case "${target_alias}" in diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 893867cb1a..6fe07e6de0 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index aa9b7edcb6..f3b2b1a9dc 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -752,9 +752,9 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl -enable_sim_inline enable_sim_endian enable_sim_alignment enable_werror @@ -4010,7 +4010,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12846,7 +12845,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12849 "configure" +#line 12848 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12952,7 +12951,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12955 "configure" +#line 12954 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13306,6 +13305,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 : @@ -13410,50 +13440,6 @@ sim_link_links="${sim_link_links} targ-vals.def" -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 - - wire_endian="BIG" default_endian="" # Check whether --enable-sim-endian was given. diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac index 4a0abe671a..8913933055 100644 --- a/sim/m68hc11/configure.ac +++ b/sim/m68hc11/configure.ac @@ -6,7 +6,6 @@ sinclude(../common/acinclude.m4) SIM_AC_COMMON dnl Options available in this module -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_WARNINGS diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index f4a2721ae5..42deadd0b0 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/mcore/configure b/sim/mcore/configure index 7e68943d49..a927f3210f 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac index ee83537862..6d5622e266 100644 --- a/sim/mcore/configure.ac +++ b/sim/mcore/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index 079ef0e856..dc6c81bf68 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/microblaze/configure b/sim/microblaze/configure index 7e68943d49..a927f3210f 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac index ee83537862..6d5622e266 100644 --- a/sim/microblaze/configure.ac +++ b/sim/microblaze/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index f7c5ae8979..21e832cb75 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/mips/configure b/sim/mips/configure index 16427de53a..acd36b23d4 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -765,9 +765,9 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl -enable_sim_inline enable_sim_alignment enable_werror enable_build_warnings @@ -4043,7 +4043,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12879,7 +12878,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12882 "configure" +#line 12881 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12985,7 +12984,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12988 "configure" +#line 12987 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13339,6 +13338,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 : @@ -13442,50 +13472,6 @@ sim_link_links="${sim_link_links} targ-vals.def" - -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 - wire_alignment="NONSTRICT_ALIGNMENT" default_alignment="" diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 4e51e0bb63..c21faaf671 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -6,7 +6,6 @@ sinclude(../common/acinclude.m4) SIM_AC_COMMON dnl Options available in this module -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_WARNINGS SIM_AC_OPTION_RESERVED_BITS(1) diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index c1cc6c0c42..cc027ff29d 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 0fa36177e8..73b5b21b7d 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -761,7 +762,6 @@ enable_build_warnings enable_sim_build_warnings enable_sim_reserved_bits enable_sim_bitsize -enable_sim_inline enable_sim_hardware ' ac_precious_vars='build_alias @@ -1406,6 +1406,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: Specify whether to check reserved bits in instruction --enable-sim-bitsize=N Specify target bitsize (32 or 64) - --enable-sim-inline=inlines - Specify which functions should be inlined --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -4016,7 +4016,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12852,7 +12851,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12855 "configure" +#line 12854 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12958,7 +12957,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12961 "configure" +#line 12960 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13312,6 +13311,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 : @@ -13684,50 +13714,6 @@ fi 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 - - if test ""; then hardware="" else diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac index 3297b0c27d..53e0cdd6c6 100644 --- a/sim/mn10300/configure.ac +++ b/sim/mn10300/configure.ac @@ -10,7 +10,6 @@ SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_WARNINGS SIM_AC_OPTION_RESERVED_BITS SIM_AC_OPTION_BITSIZE(32,31) -SIM_AC_OPTION_INLINE() SIM_AC_OPTION_HARDWARE(yes,,mn103cpu mn103int mn103tim mn103ser mn103iop) AC_CHECK_FUNCS(time chmod utime fork execve execv chown) diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index d7cd6636f1..90d2dca16c 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/moxie/configure b/sim/moxie/configure index 161f2ab5dc..cd095289f5 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -753,12 +753,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1405,6 +1405,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 @@ -1413,8 +1415,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4012,7 +4012,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12848,7 +12847,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12851 "configure" +#line 12850 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12954,7 +12953,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12957 "configure" +#line 12956 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13308,6 +13307,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 : @@ -13614,50 +13644,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac index 3ce09f6448..d9302086a5 100644 --- a/sim/moxie/configure.ac +++ b/sim/moxie/configure.ac @@ -10,7 +10,6 @@ AC_CHECK_TOOL(DTC, dtc) SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index c6431806e2..050f31727f 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/msp430/configure b/sim/msp430/configure index 85c89ca9ef..b5db5f9a34 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -752,11 +752,11 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1403,13 +1403,13 @@ 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 Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-inline=inlines - Specify which functions should be inlined --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4007,7 +4007,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12843,7 +12842,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12845 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12948,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12951 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13303,6 +13302,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 : @@ -13511,50 +13541,6 @@ fi 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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/msp430/configure.ac b/sim/msp430/configure.ac index b896ce405f..8f4e19013e 100644 --- a/sim/msp430/configure.ac +++ b/sim/msp430/configure.ac @@ -28,7 +28,6 @@ AC_CHECK_HEADERS(getopt.h) SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 01b07c9915..59a062b607 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,7 @@ +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure.ac: Delete --enable-sim-regparm and sim_regparm, diff --git a/sim/ppc/configure b/sim/ppc/configure index 260aa54cd2..3dc36ffbc9 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -4056,7 +4056,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 49fc40eca6..5c00f6153e 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/rl78/configure b/sim/rl78/configure index cad712ecee..7fb830090b 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl ' @@ -1397,6 +1398,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 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3989,7 +3992,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12825,7 +12827,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12828 "configure" +#line 12830 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12931,7 +12933,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12934 "configure" +#line 12936 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13285,6 +13287,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 : diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index d48d10bfc8..74ad55720e 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/rx/configure b/sim/rx/configure index 824447a764..515ccdebbc 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_cycle_accurate @@ -1399,6 +1400,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 --disable-cycle-accurate Disable cycle accurate simulation (faster runtime) --disable-cycle-stats Disable cycle statistics (faster runtime) @@ -3994,7 +3997,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12830,7 +12832,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12833 "configure" +#line 12835 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12936,7 +12938,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12939 "configure" +#line 12941 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13290,6 +13292,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 : diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 104a36b11d..17b1923f56 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh/configure b/sim/sh/configure index 7e68943d49..a927f3210f 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -752,12 +752,12 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_environment -enable_sim_inline enable_werror enable_build_warnings enable_sim_build_warnings @@ -1404,6 +1404,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 @@ -1412,8 +1414,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-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -4011,7 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12847,7 +12846,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12849 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12952,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12955 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13307,6 +13306,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 : @@ -13520,50 +13550,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 - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac index ee83537862..6d5622e266 100644 --- a/sim/sh/configure.ac +++ b/sim/sh/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_ENVIRONMENT -SIM_AC_OPTION_INLINE SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 0de22fc60b..b90bc5f8ee 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,8 @@ +2016-01-10 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + 2016-01-10 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh64/configure b/sim/sh64/configure index e236b7d33c..21a4643f79 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 c1fb783d25..818af1299e 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,"","") diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 7582b41099..c3500f5f52 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -6,6 +6,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger + + * configure: Regenerate. + 2016-01-09 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/v850/configure b/sim/v850/configure index e9f87c63f6..846e5921cd 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -752,6 +752,7 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile +enable_sim_inline with_pkgversion with_bugurl enable_sim_endian @@ -1404,6 +1405,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 @@ -4010,7 +4013,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -sim_inline="-DDEFAULT_INLINE=0" @@ -12846,7 +12848,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12849 "configure" +#line 12851 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12952,7 +12954,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12955 "configure" +#line 12957 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13306,6 +13308,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 : -- 2.34.1