X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fconfigure.in;h=c37304990f0fc65efae890630f259906d8a2add0;hb=3610d1317daaf338ec6ae4ae45bbfcd006ff03a8;hp=02a98f7512a5a71e5ea30234924a873bd3f34c4a;hpb=f39a09c9adb7f331d9dac1c824905b1b8c310fb4;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/configure.in b/sim/configure.in
index 02a98f7512..c37304990f 100644
--- a/sim/configure.in
+++ b/sim/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.12.1)dnl
 AC_INIT(Makefile.in)
 
 AC_PROG_CC
@@ -26,17 +26,20 @@ else
 fi
 AC_SUBST(CC_FOR_BUILD)
 
-# The PowerPC simulator uses the GCC extension long long as well as
-# ANSI prototypes, so don't enable it for random host compilers
-# unless asked to.
-
-AC_ARG_ENABLE(sim-powerpc,
-[  --enable-sim-powerpc ],
+# If a cpu ever has more than one simulator to choose from, use
+# --enable-sim=... to choose.
+AC_ARG_ENABLE(sim,
+[  --enable-sim ],
 [case "${enableval}" in
-yes)	powerpc_sim=yes ;;
-no)	powerpc_sim=no ;;
-*)	AC_MSG_ERROR(bad value ${enableval} given for sim-powerpc option) ;;
-esac],[if test x"$GCC" != x""; then powerpc_sim=yes; else powerpc_sim=no; fi])
+yes | no) ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
+esac])
+
+# Assume simulator can be built with cc.
+# If the user passes --enable-sim built it regardless of $(CC).
+only_if_gcc=no
+only_if_enabled=no
+extra_subdirs=common
 
 # WHEN ADDING ENTRIES TO THIS MATRIX:
 #  Make sure that the left side always has two dashes.  Otherwise you
@@ -45,41 +48,125 @@ esac],[if test x"$GCC" != x""; then powerpc_sim=yes; else powerpc_sim=no; fi])
 
 case "${target}" in
   arm*-*-*)		sim_target=arm ;;
-# start-sanitize-d10v
+  strongarm*-*-*)	sim_target=arm ;;
+  thumb*-*-*)           sim_target=arm ;;
   d10v-*-*)		sim_target=d10v ;;
-# end-sanitize-d10v
+  d30v-*-*)
+	sim_target=d30v
+	only_if_gcc=yes
+	extra_subdirs="${extra_subdirs} igen"
+	;;
+  fr30-*-*)		sim_target=fr30 ;;
   h8300*-*-*)		sim_target=h8300 ;;
   h8500-*-*)		sim_target=h8500 ;;
+  i960-*-*)		sim_target=i960 ;;
+  m32r-*-*)		sim_target=m32r ;;
+  mcore-*-*)		sim_target=mcore ;;
   mips*-*-*)
-				# The MIPS simulator can only be compiled
-				# by gcc.
-				if test "${GCC}" = "yes"; then
-				  sim_target=mips
-				else
-				  sim_target=none
-				fi
-				;;
-  sh*-*-*)		sim_target=sh ;; 
-  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 ;;
-# end-sanitize-v850
-  w65-*-*)		sim_target=w65 ;;
+	# The MIPS simulator can only be compiled by gcc.
+	sim_target=mips
+	only_if_gcc=yes
+	extra_subdirs="${extra_subdirs} igen"
+	;;
+  mn10300*-*-*)
+	# The mn10300 simulator can only be compiled by gcc.
+	sim_target=mn10300
+	only_if_gcc=yes
+	extra_subdirs="${extra_subdirs} igen"
+	;;
+  mn10200*-*-*)
+	sim_target=mn10200
+	;;
+  sh*-*-*)		sim_target=sh ;;
+  powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* | powerpc*-*-linux* )
+	# The PowerPC simulator uses the GCC extension long long as well as
+	# ANSI prototypes, so don't enable it for random host compilers
+	# unless asked to.
+	sim_target=ppc
+	only_if_gcc=yes
+	#extra_subdirs="${extra_subdirs}"
+	;;
+  v850-*-*)
+	# The V850 simulator can only be compiled by gcc.
+	sim_target=v850
+	extra_subdirs="${extra_subdirs} igen"
+	only_if_gcc=yes
+	;;
+  v850e-*-*)
+	# The V850 simulator can only be compiled by gcc.
+	sim_target=v850
+	extra_subdirs="${extra_subdirs} igen"
+	only_if_gcc=yes
+	;;
+  v850ea-*-*)
+	# The V850 simulator can only be compiled by gcc.
+	sim_target=v850
+	extra_subdirs="${extra_subdirs} igen"
+	only_if_gcc=yes
+	;;
+  w65-*-*)
+	sim_target=w65
+	# The w65 is suffering from gradual decay.
+	only_if_enabled=yes
+	;;
   z8k*-*-*)		sim_target=z8k ;;
-  sparc*-*-*)			# The SPARC simulator can only be compiled
-				# by gcc.
-				if test "${GCC}" = "yes"; then
-				  sim_target=erc32
-				else
-				  sim_target=none
-				fi
-				;;
+  sparc64-*-*)
+	only_if_gcc=yes
+	sim_target=none # Don't build erc32 if sparc64.
+	;;
+  sparclite*-*-* | sparc86x*-*-*)
+	# The SPARC simulator can only be compiled by gcc.
+	only_if_gcc=yes
+	sim_target=erc32
+	;;
+  sparc*-*-*)
+	# The SPARC simulator can only be compiled by gcc.
+	only_if_gcc=yes
+	# Unfortunately erc32 won't build on many hosts, so only enable
+	# it if the user really really wants it.
+	only_if_enabled=yes
+	sim_target=erc32
+	;;
   *)			sim_target=none ;;
 esac
 
-configdirs=${sim_target}
-AC_CONFIG_SUBDIRS($configdirs)
+
+
+
+# Is there a testsuite directory for the target?
+testdir=`echo ${target} | sed -e 's/-.*-/-/'`
+if test -r ${srcdir}/testsuite/${testdir}/configure ; then
+  extra_subdirs="${extra_subdirs} testsuite"
+fi
+
+
+case "${enable_sim}" in
+no)	sim_target=none ;;
+yes)
+	if test ${only_if_gcc} = yes ; then
+		if test "${GCC}" != yes ; then
+			echo "Can't enable simulator since not compiling with GCC."
+			sim_target=none
+		fi
+	fi
+	;;
+*)
+	if test ${only_if_enabled} = yes ; then
+		sim_target=none
+	else
+		if test ${only_if_gcc} = yes ; then
+			if test "${GCC}" != yes ; then
+				sim_target=none
+			fi
+		fi
+	fi
+	;;
+esac
+
+if test x"${sim_target}" != xnone ; then
+	configdirs="${extra_subdirs} ${sim_target}"
+	AC_CONFIG_SUBDIRS($configdirs)
+fi
 
 AC_OUTPUT(Makefile)