aboutsummaryrefslogtreecommitdiff
path: root/sim/m68hc11
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-03-22 22:36:12 -0400
committerMike Frysinger <vapier@gentoo.org>2015-03-23 04:40:07 -0400
commit49cd1634b2a59879329c5a285192ac581e64904c (patch)
tree4921bf4264168301549340c6cf966cfa5301a99a /sim/m68hc11
parent3649cb065699316bc8cd64b06f273c72f1806323 (diff)
downloadgdb-49cd1634b2a59879329c5a285192ac581e64904c.zip
gdb-49cd1634b2a59879329c5a285192ac581e64904c.tar.gz
gdb-49cd1634b2a59879329c5a285192ac581e64904c.tar.bz2
sim: dv-sockser: move build to common dir
If dv-sockser is available, lets add it to the common SIM_HW_OBJS variable so it is always included automatically. Now ports do not have to shoe horn it in directly themselves. It does mean it will be compiled for targets that don't explicitly use it, but that's really what we want anyways.
Diffstat (limited to 'sim/m68hc11')
-rw-r--r--sim/m68hc11/ChangeLog7
-rw-r--r--sim/m68hc11/Makefile.in5
-rwxr-xr-xsim/m68hc11/configure19
-rw-r--r--sim/m68hc11/configure.ac6
4 files changed, 14 insertions, 23 deletions
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 712dcf9..35f1e18 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+ * configure.ac (m68hc11_extra_objs): Delete.
+ * Makefile.in (SIM_OBJS): Delete SIM_EXTRA_OBJS.
+ (SIM_EXTRA_OBJS): Delete.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index f08aa53..a4a74c2 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -27,8 +27,7 @@ SIM_OBJS = $(M68HC11_OBJS) \
sim-engine.o \
sim-stop.o \
sim-hrw.o \
- sim-reason.o \
- $(SIM_EXTRA_OBJS)
+ sim-reason.o
SIM_PROFILE= -DPROFILE=1 -DWITH_PROFILE=-1
# We must use 32-bit addresses to support memory bank switching.
@@ -42,8 +41,6 @@ SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 \
-DWITH_TARGET_WORD_MSB=31
SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_OBJS = @m68hc11_extra_objs@
-
INCLUDE = $(srcdir)/../../include/gdb/callback.h \
interrupts.h sim-main.h
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 5b85244..7d559e6 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -601,8 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-m68hc11_extra_objs
-SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -12373,7 +12371,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12376 "configure"
+#line 12374 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12479,7 +12477,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12482 "configure"
+#line 12480 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13421,9 +13419,6 @@ case "${target}" in
hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
;;
- *)
- m68hc11_extra_objs=""
- ;;
esac
if test x"$hw_enabled" != x"no"; then
@@ -13476,10 +13471,12 @@ else
esac
done
# mingw does not support sockser
- SIM_DV_SOCKSER_O=""
case ${host} in
*mingw*) ;;
- *) SIM_DV_SOCKSER_O="dv-sockser.o"
+ *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device
+ # that you instatiate. Instead, other code will call into it directly.
+ # At some point, we should convert it over.
+ sim_hw_objs="$sim_hw_objs dv-sockser.o"
cat >>confdefs.h <<_ACEOF
#define HAVE_DV_SOCKSER 1
@@ -13487,7 +13484,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
@@ -13541,9 +13537,6 @@ fi
fi
-m68hc11_extra_objs="$SIM_DV_SOCKSER_O"
-
-
ac_sources="$sim_link_files"
ac_dests="$sim_link_links"
diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index d25a8db3..5aefda5 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -21,13 +21,7 @@ case "${target}" in
hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
;;
- *)
- m68hc11_extra_objs=""
- ;;
esac
SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
-m68hc11_extra_objs="$SIM_DV_SOCKSER_O"
-AC_SUBST(m68hc11_extra_objs)
-
SIM_AC_OUTPUT