diff options
author | Mike Frysinger <vapier@gentoo.org> | 2016-01-09 05:58:01 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-10 03:36:32 -0500 |
commit | 347fe5bb868b7383d4f6942894b31ecf1da6894e (patch) | |
tree | 4b72385d8aefd9d4e35121faa027755c08913a82 /sim/avr | |
parent | 0dc73ef7c304e6ffc9ce43b2131c77553a74e1d4 (diff) | |
download | gdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.zip gdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.tar.gz gdb-347fe5bb868b7383d4f6942894b31ecf1da6894e.tar.bz2 |
sim: allow the inline configure option everywhere
Currently ports have to call SIM_AC_OPTION_INLINE explicitly in order
to make the configure flag available. There's no real reason to not
allow this flag for all ports, so move it to the common sim macro.
This way we get standard behavior across all ports too.
Diffstat (limited to 'sim/avr')
-rw-r--r-- | sim/avr/ChangeLog | 5 | ||||
-rwxr-xr-x | sim/avr/configure | 86 | ||||
-rw-r--r-- | sim/avr/configure.ac | 1 |
3 files changed, 41 insertions, 51 deletions
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 44538f2..49d6e1d 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/avr/configure b/sim/avr/configure index b9b9b53..8978c0b 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 4527f79..184ccb5 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 |