diff options
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 27 | ||||
| -rw-r--r-- | sim/common/acinclude.m4 | 65 | ||||
| -rwxr-xr-x | sim/common/configure | 20 |
3 files changed, 81 insertions, 31 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index c0ddbca..1a67e5d 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,32 @@ 2015-06-23 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (AC_ARG_ENABLE(sim-bswap)): Call AS_HELP_STRING. + (AC_ARG_ENABLE(sim-cflags)): Likewise. + (AC_ARG_ENABLE(sim-debug)): Likewise. + (AC_ARG_ENABLE(sim-stdio)): Likewise. + (AC_ARG_ENABLE(sim-trace)): Likewise. + (AC_ARG_ENABLE(sim-profile)): Likewise. + (AC_ARG_ENABLE(sim-environment)): Likewise. + (AC_ARG_ENABLE(sim-alignment)): Likewise. + (AC_ARG_ENABLE(sim-assert)): Likewise. + (AC_ARG_ENABLE(sim-bitsize)): Likewise. + (AC_ARG_ENABLE(sim-endian)): Likewise. + (AC_ARG_ENABLE(sim-hostendian)): Likewise. + (AC_ARG_ENABLE(sim-float)): Likewise. + (AC_ARG_ENABLE(sim-scache)): Likewise. + (AC_ARG_ENABLE(sim-default-model)): Likewise. + (AC_ARG_ENABLE(sim-inline)): Likewise. + (AC_ARG_ENABLE(sim-packages)): Likewise. + (AC_ARG_ENABLE(sim-regparm)): Likewise. + (AC_ARG_ENABLE(sim-reserved-bits)): Likewise. + (AC_ARG_ENABLE(sim-smp)): Likewise. + (AC_ARG_ENABLE(sim-stdcall)): Likewise. + (AC_ARG_ENABLE(sim-xor-endian)): Likewise. + (AC_ARG_ENABLE(cgen-maint)): Likewise. + * configure: Regenerate. + +2015-06-23 Mike Frysinger <vapier@gentoo.org> + * sim-config.h (WITH_TRACE): Define to ~TRACE_debug. 2015-06-23 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index bed2366..672227e 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -122,7 +122,7 @@ AM_MAINTAINER_MODE dnl This is a generic option to enable special byte swapping dnl insns on *any* cpu. AC_ARG_ENABLE(sim-bswap, -[ --enable-sim-bswap Use Host specific BSWAP instruction.], +[AS_HELP_STRING([--enable-sim-bswap], [Use Host specific BSWAP instruction])], [case "${enableval}" in yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";; no) sim_bswap="-DWITH_BSWAP=0";; @@ -135,7 +135,8 @@ AC_SUBST(sim_bswap) AC_ARG_ENABLE(sim-cflags, -[ --enable-sim-cflags=opts Extra CFLAGS for use in building simulator], +[AS_HELP_STRING([--enable-sim-cflags=opts], + [Extra CFLAGS for use in building simulator])], [case "${enableval}" in yes) sim_cflags="-O2 -fomit-frame-pointer";; trace) AC_MSG_ERROR("Please use --enable-sim-debug instead."); sim_cflags="";; @@ -151,7 +152,8 @@ AC_SUBST(sim_cflags) dnl --enable-sim-debug is for developers of the simulator dnl the allowable values are work-in-progress AC_ARG_ENABLE(sim-debug, -[ --enable-sim-debug=opts Enable debugging flags], +[AS_HELP_STRING([--enable-sim-debug=opts], + [Enable debugging flags (for developers of the sim itself)])], [case "${enableval}" in yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; @@ -166,7 +168,8 @@ AC_SUBST(sim_debug) dnl --enable-sim-stdio is for users of the simulator dnl It determines if IO from the program is routed through STDIO (buffered) AC_ARG_ENABLE(sim-stdio, -[ --enable-sim-stdio Specify whether to use stdio for console input/output.], +[AS_HELP_STRING([--enable-sim-stdio], + [Specify whether to use stdio for console input/output])], [case "${enableval}" in yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; @@ -184,7 +187,8 @@ dnl up to the simulator], or is a comma separated list of names of tracing dnl elements to enable. The latter is only supported on simulators that dnl use WITH_TRACE. AC_ARG_ENABLE(sim-trace, -[ --enable-sim-trace=opts Enable tracing flags], +[AS_HELP_STRING([--enable-sim-trace=opts], + [Enable tracing of simulated programs])], [case "${enableval}" in yes) sim_trace="-DWITH_TRACE=-1";; no) sim_trace="-DWITH_TRACE=0";; @@ -213,7 +217,7 @@ dnl up to the simulator], or is a comma separated list of names of profiling dnl elements to enable. The latter is only supported on simulators that dnl use WITH_PROFILE. AC_ARG_ENABLE(sim-profile, -[ --enable-sim-profile=opts Enable profiling flags], +[AS_HELP_STRING([--enable-sim-profile=opts], [Enable profiling flags])], [case "${enableval}" in yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; @@ -277,7 +281,8 @@ dnl let's not. AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], [ AC_ARG_ENABLE(sim-environment, -[ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], +[AS_HELP_STRING([--enable-sim-environment=environment], + [Specify mixed, user, virtual or operating environment])], [case "${enableval}" in all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; @@ -303,7 +308,8 @@ wire_alignment="[$1]" default_alignment="[$2]" [ AC_ARG_ENABLE(sim-alignment, -[ --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses.], +[AS_HELP_STRING([--enable-sim-alignment=align], + [Specify strict, nonstrict or forced alignment of memory accesses])], [case "${enableval}" in strict | STRICT) sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";; nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";; @@ -350,7 +356,8 @@ dnl Conditionally compile in assertion statements. AC_DEFUN([SIM_AC_OPTION_ASSERT], [ AC_ARG_ENABLE(sim-assert, -[ --enable-sim-assert Specify whether to perform random assertions.], +[AS_HELP_STRING([--enable-sim-assert], + [Specify whether to perform random assertions])], [case "${enableval}" in yes) sim_assert="-DWITH_ASSERT=1";; no) sim_assert="-DWITH_ASSERT=0";; @@ -377,7 +384,7 @@ wire_word_msb="[$2]" wire_address_bitsize="[$3]" wire_cell_bitsize="[$4]" [AC_ARG_ENABLE(sim-bitsize, -[ --enable-sim-bitsize=N Specify target bitsize (32 or 64).], +[AS_HELP_STRING([--enable-sim-bitsize=N], [Specify target bitsize (32 or 64)])], [sim_bitsize= case "${enableval}" in 64,63 | 64,63,* ) sim_bitsize="-DWITH_TARGET_WORD_BITSIZE=64 -DWITH_TARGET_WORD_MSB=63";; @@ -442,7 +449,8 @@ AC_DEFUN([SIM_AC_OPTION_ENDIAN], wire_endian="[$1]" default_endian="[$2]" AC_ARG_ENABLE(sim-endian, -[ --enable-sim-endian=endian Specify target byte endian orientation.], +[AS_HELP_STRING([--enable-sim-endian=endian], + [Specify target byte endian orientation])], [case "${enableval}" in b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BIG_ENDIAN";; l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=LITTLE_ENDIAN";; @@ -490,7 +498,8 @@ dnl (for instance in a canadian cross) AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], [ AC_ARG_ENABLE(sim-hostendian, -[ --enable-sim-hostendian=end Specify host byte endian orientation.], +[AS_HELP_STRING([--enable-sim-hostendian=end], + [Specify host byte endian orientation])], [case "${enableval}" in no) sim_hostendian="-DWITH_HOST_BYTE_ORDER=0";; b*|B*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN";; @@ -524,7 +533,8 @@ AC_DEFUN([SIM_AC_OPTION_FLOAT], default_sim_float="[$1]" default_sim_float_bitsize="[$2]" AC_ARG_ENABLE(sim-float, -[ --enable-sim-float Specify that the target processor has floating point hardware.], +[AS_HELP_STRING([--enable-sim-float], + [Specify that the target processor has floating point hardware])], [case "${enableval}" in yes | hard) sim_float="-DWITH_FLOATING_POINT=HARD_FLOATING_POINT";; no | soft) sim_float="-DWITH_FLOATING_POINT=SOFT_FLOATING_POINT";; @@ -552,7 +562,8 @@ AC_DEFUN([SIM_AC_OPTION_SCACHE], [ default_sim_scache="ifelse([$1],,0,[$1])" AC_ARG_ENABLE(sim-scache, -[ --enable-sim-scache=size Specify simulator execution cache size.], +[AS_HELP_STRING([--enable-sim-scache=size], + [Specify simulator execution cache size])], [case "${enableval}" in yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; no) sim_scache="-DWITH_SCACHE=0" ;; @@ -572,7 +583,8 @@ AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], [ default_sim_default_model="ifelse([$1],,0,[$1])" AC_ARG_ENABLE(sim-default-model, -[ --enable-sim-default-model=model Specify default model to simulate.], +[AS_HELP_STRING([--enable-sim-default-model=model], + [Specify default model to simulate])], [case "${enableval}" in yes|no) AC_MSG_ERROR("Missing argument to --enable-sim-default-model");; *) sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";; @@ -660,7 +672,8 @@ AC_DEFUN([SIM_AC_OPTION_INLINE], [ default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" AC_ARG_ENABLE(sim-inline, -[ --enable-sim-inline=inlines Specify which functions should be inlined.], +[AS_HELP_STRING([--enable-sim-inline=inlines], + [Specify which functions should be inlined])], [sim_inline="" case "$enableval" in no) sim_inline="-DDEFAULT_INLINE=0";; @@ -704,7 +717,8 @@ AC_SUBST(sim_inline) AC_DEFUN([SIM_AC_OPTION_PACKAGES], [ AC_ARG_ENABLE(sim-packages, -[ --enable-sim-packages=list Specify the packages to be included in the build.], +[AS_HELP_STRING([--enable-sim-packages=list], + [Specify the packages to be included in the build])], [packages=disklabel case "${enableval}" in yes) ;; @@ -730,7 +744,8 @@ AC_SUBST(sim_packages) AC_DEFUN([SIM_AC_OPTION_REGPARM], [ AC_ARG_ENABLE(sim-regparm, -[ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], +[AS_HELP_STRING([--enable-sim-regparm=nr-parm], + [Pass parameters in registers instead of on the stack - x86/GCC specific])], [case "${enableval}" in 0*|1*|2*|3*|4*|5*|6*|7*|8*|9*) sim_regparm="-DWITH_REGPARM=${enableval}";; no) sim_regparm="" ;; @@ -748,7 +763,8 @@ AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], [ default_sim_reserved_bits="ifelse([$1],,1,[$1])" AC_ARG_ENABLE(sim-reserved-bits, -[ --enable-sim-reserved-bits Specify whether to check reserved bits in instruction.], +[AS_HELP_STRING([--enable-sim-reserved-bits], + [Specify whether to check reserved bits in instruction])], [case "${enableval}" in yes) sim_reserved_bits="-DWITH_RESERVED_BITS=1";; no) sim_reserved_bits="-DWITH_RESERVED_BITS=0";; @@ -765,7 +781,8 @@ AC_DEFUN([SIM_AC_OPTION_SMP], [ default_sim_smp="ifelse([$1],,5,[$1])" AC_ARG_ENABLE(sim-smp, -[ --enable-sim-smp=n Specify number of processors to configure for (default ${default_sim_smp}).], +[AS_HELP_STRING([--enable-sim-smp=n], + [Specify number of processors to configure for (default ${default_sim_smp})])], [case "${enableval}" in yes) sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5";; no) sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";; @@ -784,7 +801,8 @@ AC_SUBST(sim_smp) AC_DEFUN([SIM_AC_OPTION_STDCALL], [ AC_ARG_ENABLE(sim-stdcall, -[ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], +[AS_HELP_STRING([--enable-sim-stdcall=type], + [Use an alternative function call/return mechanism - x86/GCC specific])], [case "${enableval}" in no) sim_stdcall="" ;; std*) sim_stdcall="-DWITH_STDCALL=1";; @@ -802,7 +820,8 @@ AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], [ default_sim_xor_endian="ifelse([$1],,8,[$1])" AC_ARG_ENABLE(sim-xor-endian, -[ --enable-sim-xor-endian=n Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian}).], +[AS_HELP_STRING([--enable-sim-xor-endian=n], + [Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian})])], [case "${enableval}" in yes) sim_xor_endian="-DWITH_XOR_ENDIAN=8";; no) sim_xor_endian="-DWITH_XOR_ENDIAN=0";; @@ -953,7 +972,7 @@ dnl a directory name, but what we're doing here is an enable/disable kind dnl of thing and specifying both --enable and --with is klunky. dnl If you reeely want this to be --with, go ahead and change it. AC_ARG_ENABLE(cgen-maint, -[ --enable-cgen-maint[=DIR] build cgen generated files], +[AS_HELP_STRING([--enable-cgen-maint[=DIR]], [build cgen generated files])], [case "${enableval}" in yes) cgen_maint=yes ;; no) cgen_maint=no ;; diff --git a/sim/common/configure b/sim/common/configure index 96edf37..7f1ef52 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -1398,12 +1398,16 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-bswap Use Host specific BSWAP instruction. - --enable-sim-cflags=opts Extra CFLAGS for use in building simulator - --enable-sim-debug=opts Enable debugging flags - --enable-sim-stdio Specify whether to use stdio for console input/output. - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags + --enable-sim-bswap Use Host specific BSWAP instruction + --enable-sim-cflags=opts + Extra CFLAGS for use in building simulator + --enable-sim-debug=opts Enable debugging flags (for developers of the sim + itself) + --enable-sim-stdio Specify whether to use stdio for console + input/output + --enable-sim-trace=opts Enable tracing of simulated programs + --enable-sim-profile=opts + Enable profiling flags Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -10560,7 +10564,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10563 "configure" +#line 10567 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10666,7 +10670,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10669 "configure" +#line 10673 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |