aboutsummaryrefslogtreecommitdiff
path: root/sim
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
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')
-rw-r--r--sim/bfin/ChangeLog6
-rw-r--r--sim/bfin/Makefile.in1
-rwxr-xr-xsim/bfin/configure17
-rw-r--r--sim/bfin/configure.ac3
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/acinclude.m47
-rw-r--r--sim/cris/ChangeLog4
-rwxr-xr-xsim/cris/configure12
-rw-r--r--sim/frv/ChangeLog4
-rwxr-xr-xsim/frv/configure12
-rw-r--r--sim/iq2000/ChangeLog4
-rwxr-xr-xsim/iq2000/configure12
-rw-r--r--sim/lm32/ChangeLog5
-rw-r--r--sim/lm32/Makefile.in1
-rwxr-xr-xsim/lm32/configure12
-rw-r--r--sim/m32r/ChangeLog4
-rwxr-xr-xsim/m32r/configure12
-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
-rw-r--r--sim/mips/ChangeLog7
-rw-r--r--sim/mips/Makefile.in2
-rwxr-xr-xsim/mips/configure15
-rw-r--r--sim/mips/configure.ac2
-rw-r--r--sim/mn10300/ChangeLog4
-rwxr-xr-xsim/mn10300/configure19
-rw-r--r--sim/sh64/ChangeLog4
-rwxr-xr-xsim/sh64/configure12
29 files changed, 123 insertions, 100 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index bd22feb..1619cfc 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -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.
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index 1bf0772..a3dfd9f 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -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
diff --git a/sim/bfin/configure b/sim/bfin/configure
index e77e98a..ecd911a 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -606,8 +606,6 @@ SDL_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-BFIN_SIM_EXTRA_OBJS
-SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -12396,7 +12394,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12399 "configure"
+#line 12397 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12502,7 +12500,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12505 "configure"
+#line 12503 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13595,10 +13593,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
@@ -13606,7 +13606,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
@@ -13695,10 +13694,6 @@ fi
done
-BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} ${SIM_DV_SOCKSER_O}"
-BFIN_SIM_EXTRA_OBJS=${BFIN_SIM_EXTRA_OBJS}
-
-
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index bd7df51..31cd159 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -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, [
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c82f105..1cfb4d3 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -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.
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 2e1d31f..e4d206fe 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -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
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index d2f912d..f193ae2 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -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.
diff --git a/sim/cris/configure b/sim/cris/configure
index 7c9094e..a36a3eb 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -604,7 +604,6 @@ cgen_breaks
cgen
cgendir
CGEN_MAINT
-SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -12383,7 +12382,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12386 "configure"
+#line 12385 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12489,7 +12488,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12492 "configure"
+#line 12491 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13462,10 +13461,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
@@ -13473,7 +13474,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 5968f7e..6957942 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -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.
diff --git a/sim/frv/configure b/sim/frv/configure
index d312971..847c4bb 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
sim_trapdump
cgen
cgendir
@@ -12378,7 +12377,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12381 "configure"
+#line 12380 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12484,7 +12483,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12487 "configure"
+#line 12486 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13464,10 +13463,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
@@ -13475,7 +13476,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 884c21f..5fdf7d5 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -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.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 353ace0..97aeed1 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
cgen
cgendir
CGEN_MAINT
@@ -12377,7 +12376,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12380 "configure"
+#line 12379 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12483,7 +12482,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12486 "configure"
+#line 12485 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13489,10 +13488,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
@@ -13500,7 +13501,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index a02609e..3ea4b85 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -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.
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 61e4137..60420a1 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -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 \
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 22ed7d5..fd4185f 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
cgen
cgendir
CGEN_MAINT
@@ -12375,7 +12374,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12378 "configure"
+#line 12377 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12481,7 +12480,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12484 "configure"
+#line 12483 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13442,10 +13441,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
@@ -13453,7 +13454,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index bc379a0..b2261b2 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -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.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 0065621..7dbcdf0 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
sim_extra_cflags
traps_obj
cgen
@@ -12379,7 +12378,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12382 "configure"
+#line 12381 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12485,7 +12484,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12488 "configure"
+#line 12487 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13504,10 +13503,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
@@ -13515,7 +13516,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
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
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 5c8e6eb..60275b0 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -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>
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 67bce7f..b9151eb 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -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 \
diff --git a/sim/mips/configure b/sim/mips/configure
index 650b6bb..792d77c 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -604,8 +604,6 @@ cgen_breaks
mips_extra_libs
XMKMF
mips_igen_engine
-mips_extra_objs
-SIM_DV_SOCKSER_O
sim_multi_obj
sim_multi_src
sim_multi_igen_configs
@@ -12402,7 +12400,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12405 "configure"
+#line 12403 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12508,7 +12506,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12511 "configure"
+#line 12509 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14059,10 +14057,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
@@ -14070,7 +14070,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
@@ -14123,8 +14122,6 @@ fi
esac
fi
-mips_extra_objs="$SIM_DV_SOCKSER_O"
-
# Choose simulator engine
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 02deab6..4dee7d4 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -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
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 9a6cc45..44a9f52 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -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>
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index f0a650a..665075f 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -12378,7 +12377,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12381 "configure"
+#line 12380 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12484,7 +12483,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12487 "configure"
+#line 12486 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13586,10 +13585,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
@@ -13597,7 +13598,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
@@ -13728,10 +13728,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
@@ -13739,7 +13741,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 0cb1075..5ce0cfe 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -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.
diff --git a/sim/sh64/configure b/sim/sh64/configure
index c298280..1099306 100755
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-SIM_DV_SOCKSER_O
cgen
cgendir
CGEN_MAINT
@@ -12377,7 +12376,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12380 "configure"
+#line 12379 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12483,7 +12482,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12486 "configure"
+#line 12485 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13489,10 +13488,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
@@ -13500,7 +13501,6 @@ _ACEOF
;;
esac
-
if test x"$silent" != x"yes"; then
echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
fi