aboutsummaryrefslogtreecommitdiff
path: root/sim/m32r
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-04-23 21:58:21 -0400
committerMike Frysinger <vapier@gentoo.org>2021-04-23 21:58:21 -0400
commit9d90335212595f76b0f29698dfb2468c7318c171 (patch)
treea375141b7c411b117d22b66fe6832d24814abde5 /sim/m32r
parentb2d14d3d8f5283fbb81603184380e26f5953b25c (diff)
downloadfsf-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/m32r')
-rw-r--r--sim/m32r/ChangeLog5
-rwxr-xr-xsim/m32r/configure8
-rw-r--r--sim/m32r/configure.ac2
3 files changed, 7 insertions, 8 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 6ba7bb4..7fb4761 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/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>
* configure, config.in: Rebuild.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index fb35163..983afc6 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -12124,13 +12124,7 @@ fi
-if test ""; then
- hardware=""
-else
- hardware="cfi core pal glue"
-fi
-hardware="$hardware m32r_cache m32r_uart"
-
+hardware="cfi core pal glue m32r_cache m32r_uart"
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/m32r/configure.ac b/sim/m32r/configure.ac
index 2fd7f72..8ab55bc 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -24,6 +24,6 @@ SIM_AC_OPTION_CGEN_MAINT
AC_SUBST(traps_obj)
AC_SUBST(sim_extra_cflags)
-SIM_AC_OPTION_HARDWARE(yes,,m32r_cache m32r_uart)
+SIM_AC_OPTION_HARDWARE(m32r_cache m32r_uart)
SIM_AC_OUTPUT