From 9d90335212595f76b0f29698dfb2468c7318c171 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 23 Apr 2021 21:58:21 -0400 Subject: sim: simplify hardware m4 macro Every port using this sets the 1st arg to yes and the 2nd arg to "". These are the defaults we probably want anyways in order to unify the codebase, so move them to the macro and only allow ports to declare extra hardware models. --- sim/cris/ChangeLog | 5 +++++ sim/cris/configure | 8 +------- sim/cris/configure.ac | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'sim/cris') diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 07d3086..d123611 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2021-04-23 Mike Frysinger + + * configure.ac (SIM_AC_OPTION_HARDWARE): Delete first two args. + * configure: Regenerate. + 2021-04-22 Tom Tromey * rvdummy.c: Update includes. diff --git a/sim/cris/configure b/sim/cris/configure index 2a615b1..6f0b25e 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -12071,13 +12071,7 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; } fi -if test ""; then - hardware="" -else - hardware="cfi core pal glue" -fi -hardware="$hardware rv cris cris_900000xx" - +hardware="cfi core pal glue rv cris cris_900000xx" sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\1.o/g'`" diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac index 56afe58..f8aa533 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -15,7 +15,7 @@ SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_WARNINGS(no) -SIM_AC_OPTION_HARDWARE(yes,,rv cris cris_900000xx) +SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx) # The default model shouldn't matter as long as there's a BFD. SIM_AC_OPTION_DEFAULT_MODEL(crisv32) -- cgit v1.1