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/mips | |
| parent | b2d14d3d8f5283fbb81603184380e26f5953b25c (diff) | |
| download | fsf-binutils-gdb-9d90335212595f76b0f29698dfb2468c7318c171.zip fsf-binutils-gdb-9d90335212595f76b0f29698dfb2468c7318c171.tar.gz fsf-binutils-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/mips')
| -rw-r--r-- | sim/mips/ChangeLog | 6 | ||||
| -rwxr-xr-x | sim/mips/configure | 13 | ||||
| -rw-r--r-- | sim/mips/configure.ac | 5 |
3 files changed, 11 insertions, 13 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 2e055ec..40c9ad5 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,9 @@ +2021-04-23 Mike Frysinger <vapier@gentoo.org> + + * configure.ac (hw_enabled): Delete. + (SIM_AC_OPTION_HARDWARE): Delete first two args. + * configure: Regenerate. + 2021-04-22 Tom Tromey <tom@tromey.com> * configure, config.in: Rebuild. diff --git a/sim/mips/configure b/sim/mips/configure index bdf659d..85e0832 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -12575,23 +12575,16 @@ sim_micromips_flags=" -F ${sim_micromips_filter} ${sim_micromips_machine} ${si # # Add simulated hardware devices # -hw_enabled=no +hw_extra_devices="" case "${target}" in mips*tx39*) - hw_enabled=yes hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" ;; *) ;; esac -if test "$hw_devices"; then - hardware="$hw_devices" -else - hardware="cfi core pal glue" -fi -hardware="$hardware $hw_extra_devices" - +hardware="cfi core pal glue $hw_extra_devices" 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'`" @@ -12600,7 +12593,7 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([^ ][^ ]*\)/dv-\ if test "${enable_sim_hardware+set}" = set; then : enableval=$enable_sim_hardware; else - enable_sim_hardware="$hw_enabled" + enable_sim_hardware="yes" fi case ${enable_sim_hardware} in diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index ec45245..593ee2b 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -426,16 +426,15 @@ AC_SUBST(sim_multi_obj) # # Add simulated hardware devices # -hw_enabled=no +hw_extra_devices="" case "${target}" in mips*tx39*) - hw_enabled=yes hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" ;; *) ;; esac -SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices) +SIM_AC_OPTION_HARDWARE($hw_extra_devices) # Choose simulator engine |