diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-04-23 21:58:21 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-04-23 21:58:21 -0400 |
| commit | 9d90335212595f76b0f29698dfb2468c7318c171 (patch) | |
| tree | a375141b7c411b117d22b66fe6832d24814abde5 /sim/cris | |
| parent | b2d14d3d8f5283fbb81603184380e26f5953b25c (diff) | |
| download | gdb-9d90335212595f76b0f29698dfb2468c7318c171.zip gdb-9d90335212595f76b0f29698dfb2468c7318c171.tar.gz gdb-9d90335212595f76b0f29698dfb2468c7318c171.tar.bz2 | |
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.
Diffstat (limited to 'sim/cris')
| -rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/cris/configure | 8 | ||||
| -rw-r--r-- | sim/cris/configure.ac | 2 |
3 files changed, 7 insertions, 8 deletions
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 <vapier@gentoo.org> + + * configure.ac (SIM_AC_OPTION_HARDWARE): Delete first two args. + * configure: Regenerate. + 2021-04-22 Tom Tromey <tom@tromey.com> * 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) |