2013-03-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac: Address use of dv-sockser.o.
	* tconfig.in: Conditionalize use of dv_sockser_install.
	* configure: Regenerated.
	* config.in: Regenerated.

5 files changed, 60 insertions, 6 deletions

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 4d5bde2..7d91efe 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-23  Joel Sherrill  <joel.sherrill@oarcorp.com>
+
+	* configure.ac: Address use of dv-sockser.o.
+	* tconfig.in: Conditionalize use of dv_sockser_install.
+	* configure: Regenerated.
+	* config.in: Regenerated.
+
 2012-10-04  Chao-ying Fu  <fu@mips.com>
 	    Steve Ellcey  <sellcey@mips.com>
 
diff --git a/sim/mips/config.in b/sim/mips/config.in
index 9f71eb8..ef3289b 100644
--- a/sim/mips/config.in
+++ b/sim/mips/config.in
@@ -16,6 +16,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define if dv-sockser is usable. */
+#undef HAVE_DV_SOCKSER
+
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
@@ -88,6 +91,10 @@
 /* Define to 1 if you have the `__setfpucw' function. */
 #undef HAVE___SETFPUCW
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of this package. */
 #undef PACKAGE
 
diff --git a/sim/mips/configure b/sim/mips/configure
index c4cb96a..38ebfbd 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -605,6 +605,7 @@ mips_extra_libs
 XMKMF
 mips_igen_engine
 mips_extra_objs
+SIM_DV_SOCKSER_O
 sim_multi_obj
 sim_multi_src
 sim_multi_igen_configs
@@ -12300,7 +12301,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12303 "configure"
+#line 12304 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12406,7 +12407,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12409 "configure"
+#line 12410 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13724,7 +13725,7 @@ if test ${sim_gen} = MULTI; then
 
   cat << __EOF__ > multi-run.c
 /* Main entry point for MULTI simulators.
-   Copyright (C) 2003, 2007, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13909,7 +13910,7 @@ case "${target}" in
 	;;
 esac
 
-if test x"$hw_enabled" = x"yes"; then
+if test x"$hw_enabled" != x"no"; then
   sim_hw_p=yes
 else
   sim_hw_p=no
@@ -13948,6 +13949,19 @@ else
       *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
     esac
   done
+  # mingw does not support sockser
+  SIM_DV_SOCKSER_O=""
+  case ${host} in
+    *mingw*) ;;
+    *) SIM_DV_SOCKSER_O="dv-sockser.o"
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DV_SOCKSER 1
+_ACEOF
+
+       ;;
+  esac
+
 fi
 if test x"$silent" != x"yes" && test "$sim_hw_p" = "yes"; then
   echo "Setting hardware to $sim_hw_cflags, $sim_hw, $sim_hw_objs"
@@ -13955,6 +13969,10 @@ fi
 else
 
 if test "$sim_hw_p" != yes; then
+  if test "$hw_enabled" = "always"; then
+    as_fn_error "Sorry, but this simulator requires that hardware support
+be enabled. Please configure without --disable-hw-support." "$LINENO" 5
+  fi
   sim_hw_objs=
   sim_hw_cflags="-DWITH_HW=0"
   sim_hw=
@@ -14012,8 +14030,17 @@ fi
 ;;
 esac
 
-mips_extra_objs="dv-sockser.o"
+mips_extra_objs="$SIM_DV_SOCKSER_O"
+
 
+if test "$sim_hw_p" = yes -a -z "$SIM_DV_SOCKSER_O"; then
+	case " $sim_hw " in
+	*" tx3904sio "*)
+		as_fn_error "Sorry, but tx3904sio hardware support is
+unavailable for your target.  Please use --disable-sim-hardware, or pass a
+list of devices to enable that does not include that." "$LINENO" 5
+	esac
+fi
 
 
 # Choose simulator engine
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 862e2b5..4949ad9 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -419,9 +419,18 @@ case "${target}" in
 	;;
 esac
 SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
-mips_extra_objs="dv-sockser.o"
+mips_extra_objs="$SIM_DV_SOCKSER_O"
 AC_SUBST(mips_extra_objs)
 
+if test "$sim_hw_p" = yes -a -z "$SIM_DV_SOCKSER_O"; then
+	case " $sim_hw " in
+	*" tx3904sio "*)
+		AC_MSG_ERROR([Sorry, but tx3904sio hardware support is
+unavailable for your target.  Please use --disable-sim-hardware, or pass a
+list of devices to enable that does not include that.])
+	esac
+fi
+
 
 # Choose simulator engine
 case "${target}" in
diff --git a/sim/mips/tconfig.in b/sim/mips/tconfig.in
index 2f14ce1..a68a5fb 100644
--- a/sim/mips/tconfig.in
+++ b/sim/mips/tconfig.in
@@ -10,8 +10,12 @@
 #include "gdb/remote-sim.h"
 #include "sim-module.h"
 
+/* FIXME: Revisit.  */
+#ifdef HAVE_DV_SOCKSER
 MODULE_INSTALL_FN dv_sockser_install;
 #define MODULE_LIST dv_sockser_install,
+#endif
+
 #else
 #define SIM_HANDLES_LMA 0
 #endif