@@ -1,5 +1,11 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
+ * configure: Regenerate.
+ * configure.ac (BFIN_SIM_EXTRA_OBJS): Delete.
+ * Makefile.in (SIM_OBJS): Delete @BFIN_SIM_EXTRA_OBJS@.
+
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
* dv-bfin_uart.c [!HAVE_DV_SOCKSER] (dv_sockser_status,
dv_sockser_write, dv_sockser_read): Delete.
@@ -36,7 +36,6 @@ SIM_OBJS = \
sim-reg.o \
sim-resume.o \
sim-stop.o \
- @BFIN_SIM_EXTRA_OBJS@ \
$(SIM_EXTRA_OBJS)
INCLUDE = bfin-sim.h
@@ -56,9 +56,6 @@ AC_CHECK_HEADERS([ \
sys/mman.h \
])
-BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}"
-AC_SUBST([BFIN_SIM_EXTRA_OBJS], ${BFIN_SIM_EXTRA_OBJS})
-
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(SDL, sdl, [
AC_CHECK_LIB(dl, dlopen, [
@@ -1,5 +1,10 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
+ * acinclude.m4 (SIM_AC_OPTION_HARDWARE): Delete SIM_DV_SOCKSER_O.
+ Add dv-sockser.o to sim_hw_objs.
+
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
* dv-sockser.c: Include config.h.
* dv-sockser.h: Include sim-inline.h.
[HAVE_DV_SOCKSER]: Move all prototypes here.
@@ -638,15 +638,16 @@ 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"
AC_DEFINE_UNQUOTED(
[HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
;;
esac
- AC_SUBST(SIM_DV_SOCKSER_O)
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
@@ -1,3 +1,7 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
@@ -1,3 +1,8 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+ * Makefile.in (SIM_OBJS): Delete @SIM_DV_SOCKSER_O@.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
@@ -12,7 +12,6 @@ SIM_OBJS = \
sim-model.o \
sim-reg.o \
sim-signal.o \
- @SIM_DV_SOCKSER_O@ \
cgen-utils.o cgen-trace.o cgen-scache.o \
cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
sim-if.o arch.o \
@@ -1,3 +1,7 @@
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-16 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
@@ -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.
@@ -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
@@ -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
@@ -1,6 +1,13 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
+ * configure.ac (mips_extra_objs): Delete.
+ * Makefile.in (MIPS_EXTRA_OBJS): Delete.
+ (SIM_OBJS): Delete MIPS_EXTRA_OBJS.
+
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
* configure.ac: Delete sim_hw checks for dv-sockser.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
@@ -37,13 +37,11 @@ SIM_M16_OBJ = \
SIM_MULTI_OBJ = itable.o @sim_multi_obj@
-MIPS_EXTRA_OBJS = @mips_extra_objs@
MIPS_EXTRA_LIBS = @mips_extra_libs@
SIM_OBJS = \
$(SIM_@sim_gen@_OBJ) \
$(SIM_NEW_COMMON_OBJS) \
- $(MIPS_EXTRA_OBJS) \
cp1.o \
interp.o \
mdmx.o \
@@ -419,8 +419,6 @@ case "${target}" in
;;
esac
SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
-mips_extra_objs="$SIM_DV_SOCKSER_O"
-AC_SUBST(mips_extra_objs)
# Choose simulator engine
@@ -1,6 +1,10 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
+
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
* configure.ac: Delete SIM_DV_SOCKSER_O check.
2015-03-16 Mike Frysinger <vapier@gentoo.org>
@@ -1,5 +1,9 @@
2015-03-23 Mike Frysinger <vapier@gentoo.org>
+ * configure: Regenerate.
+
+2015-03-23 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in (CONFIG_DEVICES): Delete.
(SIM_OBJS): Delete CONFIG_DEVICES.