summaryrefslogtreecommitdiff
path: root/sim/mn10300
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/mn10300
parentb2d14d3d8f5283fbb81603184380e26f5953b25c (diff)
downloadbinutils-gdb-9d90335212595f76b0f29698dfb2468c7318c171.tar.gz
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/mn10300')
-rw-r--r--sim/mn10300/ChangeLog5
-rwxr-xr-xsim/mn10300/configure8
-rw-r--r--sim/mn10300/configure.ac2
3 files changed, 7 insertions, 8 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 0ad3257aa39..aa09b2cca14 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/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/mn10300/configure b/sim/mn10300/configure
index 4c6ad23b83b..f7e634e8f78 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -12110,13 +12110,7 @@ fi
fi
-if test ""; then
- hardware=""
-else
- hardware="cfi core pal glue"
-fi
-hardware="$hardware mn103cpu mn103int mn103tim mn103ser mn103iop"
-
+hardware="cfi core pal glue mn103cpu mn103int mn103tim mn103ser mn103iop"
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/mn10300/configure.ac b/sim/mn10300/configure.ac
index f8b8ef8d2b3..55aec73be50 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -9,6 +9,6 @@ SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
SIM_AC_OPTION_WARNINGS(no)
SIM_AC_OPTION_RESERVED_BITS
SIM_AC_OPTION_BITSIZE(32,31)
-SIM_AC_OPTION_HARDWARE(yes,,mn103cpu mn103int mn103tim mn103ser mn103iop)
+SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop)
SIM_AC_OUTPUT