aboutsummaryrefslogtreecommitdiff
path: root/sim/m68hc11
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/m68hc11
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/m68hc11')
-rw-r--r--sim/m68hc11/ChangeLog5
-rwxr-xr-xsim/m68hc11/configure9
-rw-r--r--sim/m68hc11/configure.ac2
3 files changed, 8 insertions, 8 deletions
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 3da7580..788ecfe 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/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/m68hc11/configure b/sim/m68hc11/configure
index 04e56ff..e2e78f8 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -12029,13 +12029,8 @@ $as_echo "${WARN_CFLAGS} ${WERROR_CFLAGS}" >&6; }
fi
-if test ""; then
- hardware=""
-else
- hardware="cfi core pal glue"
-fi
-hardware="$hardware m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
-
+hardware="cfi core pal glue \
+ m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
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/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index 6148d1d..be52b63 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -8,7 +8,7 @@ dnl Options available in this module
SIM_AC_OPTION_ENDIAN(BIG)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
SIM_AC_OPTION_WARNINGS(no)
-SIM_AC_OPTION_HARDWARE(yes,,
+SIM_AC_OPTION_HARDWARE(\
m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram)
SIM_AC_OUTPUT