2012-09-03 Joel Sherrill <joel.sherrill@oarcorp.com>

	* configure.ac: Always link against dv-sockser.o.
	* configure: Regenerate.

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 39830b1617ffe6b959aaa72ead40dcf2f57f8009..95e23dea9e4bb9a2b2c23985409d1909e8d1c48e 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-03 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+       * configure.ac: Always link against dv-sockser.o.
+       * configure: Regenerate.
+
 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
 
        * config.in, configure: Regenerate.

diff --git a/sim/mips/configure b/sim/mips/configure
index 1986f330918836bc908576b240db6edbf266d1d4..b0b6a637328f6c80e9a2e45bcba5163873565c65 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -5845,11 +5845,9 @@ case "${target}" in
   mips*tx39*)
        hw_enabled=yes
        hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio"
-       mips_extra_objs="dv-sockser.o"
        SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_TX3904=1"
        ;;
   *)
-       mips_extra_objs=""
        ;;
 esac
 
@@ -5956,6 +5954,7 @@ fi
 ;;
 esac
 
+mips_extra_objs="dv-sockser.o"
 
 
 

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 5f59637c110cd59392f79f00d947b6be189347b3..3d833a63091949a721776eef549d0fe38689c3b7 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -409,14 +409,13 @@ case "${target}" in
   mips*tx39*)
        hw_enabled=yes
        hw_extra_devices="tx3904cpu tx3904irc tx3904tmr tx3904sio" 
-       mips_extra_objs="dv-sockser.o"
        SIM_SUBTARGET="$SIM_SUBTARGET -DTARGET_TX3904=1"
        ;;
   *)
-       mips_extra_objs="" 
        ;;
 esac
 SIM_AC_OPTION_HARDWARE($hw_enabled,$hw_devices,$hw_extra_devices)
+mips_extra_objs="dv-sockser.o"
 AC_SUBST(mips_extra_objs)