aboutsummaryrefslogtreecommitdiff
path: root/sim/sh64
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/sh64
parent3649cb065699316bc8cd64b06f273c72f1806323 (diff)
downloadfsf-binutils-gdb-49cd1634b2a59879329c5a285192ac581e64904c.zip
fsf-binutils-gdb-49cd1634b2a59879329c5a285192ac581e64904c.tar.gz
fsf-binutils-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/sh64')
-rw-r--r--sim/sh64/ChangeLog4
-rwxr-xr-xsim/sh64/configure12
2 files changed, 10 insertions, 6 deletions
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