diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-19 20:06:12 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-21 22:20:18 -0400 |
| commit | 456ef1c1d43c0407801fb2d59db355472be8a554 (patch) | |
| tree | ae7c5f7bbef0f9f9b05f73d97c8131538b52a965 /sim/pru | |
| parent | be0387eed099dbc2f2bdc92fbf60e04f846c3b2b (diff) | |
| download | binutils-456ef1c1d43c0407801fb2d59db355472be8a554.zip binutils-456ef1c1d43c0407801fb2d59db355472be8a554.tar.gz binutils-456ef1c1d43c0407801fb2d59db355472be8a554.tar.bz2 | |
sim: unify hardware settings
Move these options up to the common dir so we only test & export
them once across all ports.
Diffstat (limited to 'sim/pru')
| -rw-r--r-- | sim/pru/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/pru/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/pru/configure | 53 |
3 files changed, 5 insertions, 54 deletions
diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index 38f482d..33f404e 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,5 +1,10 @@ 2021-06-21 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-21 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2021-06-20 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4 index 1e96f10..c9414d4 100644 --- a/sim/pru/aclocal.m4 +++ b/sim/pru/aclocal.m4 @@ -12,5 +12,4 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/pru/configure b/sim/pru/configure index f3b1467..cc3fa8b 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -590,10 +590,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -sim_hw_sockser -sim_hw_cflags -SIM_ENABLE_HW_FALSE -SIM_ENABLE_HW_TRUE target_alias host_alias build_alias @@ -635,7 +631,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_hardware ' ac_precious_vars='build_alias host_alias @@ -1243,12 +1238,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-hardware Whether to enable hardware/device simulation - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1679,48 +1668,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim hardware settings" >&5 -$as_echo_n "checking for sim hardware settings... " >&6; } -# Check whether --enable-sim-hardware was given. -if test "${enable_sim_hardware+set}" = set; then : - enableval=$enable_sim_hardware; -else - enable_sim_hardware="yes" -fi - -sim_hw_sockser= -if test "$enable_sim_hardware" = no; then - sim_hw_cflags="-DWITH_HW=0" -elif test "$enable_sim_hardware" = yes; then - sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac -else - as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 -fi -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_sim_hardware}" >&5 -$as_echo "${enable_sim_hardware}" >&6; } - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then cgen_breaks="break cgen_rtx_error"; |