aboutsummaryrefslogtreecommitdiff
path: root/sim/iq2000
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/iq2000
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/iq2000')
-rw-r--r--sim/iq2000/ChangeLog5
-rwxr-xr-xsim/iq2000/configure8
-rw-r--r--sim/iq2000/configure.ac2
3 files changed, 7 insertions, 8 deletions
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 9857bda..addf3c6 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac (SIM_AC_OPTION_HARDWARE): Delete arguments.
+ * configure: Regenerate.
+
2021-04-22 Tom Tromey <tom@tromey.com>
* configure, config.in: Rebuild.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index df5c33d..21b500c 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -12109,13 +12109,7 @@ fi
-if test """"; then
- hardware=""""
-else
- hardware="cfi core pal glue"
-fi
-hardware="$hardware """
-
+hardware="cfi core pal glue "
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/iq2000/configure.ac b/sim/iq2000/configure.ac
index 1a5dcfb..f21bc80 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -11,6 +11,6 @@ SIM_AC_OPTION_DEFAULT_MODEL(iq2000)
SIM_AC_OPTION_WARNINGS(no)
SIM_AC_OPTION_CGEN_MAINT
-SIM_AC_OPTION_HARDWARE(yes,"","")
+SIM_AC_OPTION_HARDWARE
SIM_AC_OUTPUT