diff --git a/sim/ChangeLog b/sim/ChangeLog
index 1d186627bf..5711f573ea 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,14 @@
+Fri Oct 11 21:13:43 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Only build the V850 simulator if
+	we are using gcc.
+	* configure: Rebuild.
+
+Sun Sep  8 17:22:50 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Do build erc32 for DOS and Windows hosts.
+	* configure: Rebuild.
+
 Wed Sep  4 18:11:27 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* Makefile.in erc32/Makefile.in:  Don't set srcroot.  This should
diff --git a/sim/configure b/sim/configure
index cd997d12e7..8f854dd17c 100755
--- a/sim/configure
+++ b/sim/configure
@@ -1215,16 +1215,19 @@ case "${target}" in
   powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* )
 			if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;;
 # start-sanitize-v850
-  v850-*-*)		sim_target=v850 ;;
+  v850-*-*)
+				# The V850 simulator can only be compiled
+				# by gcc.
+				if test "${GCC}" = "yes"; then
+				  sim_target=v850
+				else
+				  sim_target=none
+				fi
+				;;
 # end-sanitize-v850
   w65-*-*)		sim_target=w65 ;;
   z8k*-*-*)		sim_target=z8k ;;
-  sparc*-*-*)		case "${host}" in	# don't build for non Unix systems
-			  *-*-go32)	sim_target=none ;;
-			  *-*-winnt)	sim_target=none ;;
-			  *-*-cygwin32)	sim_target=none ;;
-  			  *)
-				# The SPARC simulator can only be compiled
+  sparc*-*-*)			# The SPARC simulator can only be compiled
 				# by gcc.
 				if test "${GCC}" = "yes"; then
 				  sim_target=erc32
@@ -1232,7 +1235,6 @@ case "${target}" in
 				  sim_target=none
 				fi
 				;;
-  			esac ;;
   *)			sim_target=none ;;
 esac
 
diff --git a/sim/configure.in b/sim/configure.in
index 02a98f7512..4400b69d68 100644
--- a/sim/configure.in
+++ b/sim/configure.in
@@ -63,7 +63,15 @@ case "${target}" in
   powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* )
 			if test x"$powerpc_sim" = x"yes"; then sim_target=ppc; fi ;;
 # start-sanitize-v850
-  v850-*-*)		sim_target=v850 ;;
+  v850-*-*)
+				# The V850 simulator can only be compiled
+				# by gcc.
+				if test "${GCC}" = "yes"; then
+				  sim_target=v850
+				else
+				  sim_target=none
+				fi
+				;;
 # end-sanitize-v850
   w65-*-*)		sim_target=w65 ;;
   z8k*-*-*)		sim_target=z8k ;;