common/ChangeLog:
2013-03-17  Joel Sherrill <joel.sherrill@oarcorp.com>

	* acinclude.m4: Add SIM_DV_SOCKSER_O which is empty on hosts
	which do not support dv-sockser.o.

bfin/ChangeLog:
2013-03-17  Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac: Use $SIM_DV_SOCKSER_O
	* configure: Regenerated.

m68hc11/ChangeLog:
2013-03-17  Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac: Use $SIM_DV_SOCKSER_O
	* configure: Regenerated.

mips/ChangeLog:
2013-03-17  Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac: Use $SIM_DV_SOCKSER_O
	* configure: Regenerated.

diff -uNr gdb-7.5.91-virgin/sim/bfin/configure.ac gdb-7.5.91/sim/bfin/configure.ac
--- gdb-7.5.91-virgin/sim/bfin/configure.ac	2012-04-09 01:13:06.000000000 -0500
+++ gdb-7.5.91/sim/bfin/configure.ac	2013-03-17 10:29:12.831880985 -0500
@@ -56,17 +56,7 @@
 	sys/mman.h \
 ])
 
-BFIN_SIM_EXTRA_OBJS=
-
-dnl make sure the dv-sockser code can be supported (i.e. windows)
-case ${host} in
-  *mingw32*) ;;
-  *)
-    AC_DEFINE_UNQUOTED([HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
-    BFIN_SIM_EXTRA_OBJS="${BFIN_SIM_EXTRA_OBJS} dv-sockser.o"
-    ;;
-esac
-
+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
Binary files gdb-7.5.91-virgin/sim/bfin/.configure.ac.swp and gdb-7.5.91/sim/bfin/.configure.ac.swp differ
diff -uNr gdb-7.5.91-virgin/sim/common/acinclude.m4 gdb-7.5.91/sim/common/acinclude.m4
--- gdb-7.5.91-virgin/sim/common/acinclude.m4	2012-11-20 08:41:08.000000000 -0600
+++ gdb-7.5.91/sim/common/acinclude.m4	2013-03-17 10:24:21.757167294 -0500
@@ -647,6 +647,16 @@
       *) sim_hw="$sim_hw $i" ; sim_hw_objs="$sim_hw_objs dv-$i.o";;
     esac
   done
+  # mingw32 does not support sockser
+ SIM_DV_SOCKSER_O=""
+  case ${host} in
+    *mingw32*) ;;
+    *) SIM_DV_SOCKSER_O="dv-sockser.o"
+       AC_DEFINE_UNQUOTED(
+         [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
+       ;;
+  esac
+  AC_SUBST(SIM_DV_SOCKSER_O)
 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"
diff -uNr gdb-7.5.91-virgin/sim/m68hc11/configure.ac gdb-7.5.91/sim/m68hc11/configure.ac
--- gdb-7.5.91-virgin/sim/m68hc11/configure.ac	2011-10-17 19:30:58.000000000 -0500
+++ gdb-7.5.91/sim/m68hc11/configure.ac	2013-03-17 10:17:21.532456675 -0500
@@ -19,7 +19,7 @@
   m68hc11-*-*|m6811-*-*)
 	hw_enabled=yes
 	hw_extra_devices="m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram"
-	m68hc11_extra_objs="dv-sockser.o"
+	m68hc11_extra_objs="$SIM_SV_SOCKSER_O"
 	SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_M68HC11=1"
 	;;
   *)
diff -uNr gdb-7.5.91-virgin/sim/mips/configure.ac gdb-7.5.91/sim/mips/configure.ac
--- gdb-7.5.91-virgin/sim/mips/configure.ac	2013-01-01 00:41:39.000000000 -0600
+++ gdb-7.5.91/sim/mips/configure.ac	2013-03-17 10:36:33.251716513 -0500
@@ -414,12 +414,12 @@
 	hw_enabled=yes
 	hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" 
 	SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_TX3904=1"
+	mips_extra_objs="$SIM_DV_SOCKSER_O"
 	;;
   *)
 	;;
 esac
 SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
-mips_extra_objs="dv-sockser.o"
 AC_SUBST(mips_extra_objs)