2003-07-22 Michael Snyder <msnyder@redhat.com>

[deliverable/binutils-gdb.git] / sim / configure.in

diff --git a/sim/configure.in b/sim/configure.in
index 2322071c0464b99f45b1fa9f080d1a1d4517c4a1..4a1b0b54d525be5712645d5010de3fd3c975ea30 100644 (file)
--- 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.12.1)dnl
+AC_PREREQ(2.13)dnl
 AC_INIT(Makefile.in)
 
 AC_PROG_CC
@@ -18,7 +18,6 @@ AC_SUBST(AR)
 AC_PROG_RANLIB
 
 # Put a plausible default for CC_FOR_BUILD in Makefile.
-AC_C_CROSS
 if test "x$cross_compiling" = "xno"; then
   CC_FOR_BUILD='$(CC)'
 else
@@ -47,20 +46,34 @@ extra_subdirs=common
 #  convention, else the table becomes a real mess to understand and maintain.
 
 case "${target}" in
-  arm*-*-*)            sim_target=arm ;;
-  strongarm*-*-*)      sim_target=arm ;;
-  thumb*-*-*)           sim_target=arm ;;
+  arm*-*-* | thumb*-*-*)
+       sim_target=arm
+       extra_subdirs="${extra_subdirs} testsuite"
+       ;;
+  strongarm*-*-*)
+       sim_target=arm
+       extra_subdirs="${extra_subdirs} testsuite"
+       ;;
+  xscale-*-*)
+       sim_target=arm
+       extra_subdirs="${extra_subdirs} testsuite"
+       ;;
   d10v-*-*)            sim_target=d10v ;;
-  d30v-*-*)
-       sim_target=d30v
-       only_if_gcc=yes
-       extra_subdirs="${extra_subdirs} igen"
+# OBSOLETE   d30v-*-*)
+# OBSOLETE     sim_target=d30v
+# OBSOLETE     only_if_gcc=yes
+# OBSOLETE     extra_subdirs="${extra_subdirs} igen"
+# OBSOLETE     ;;
+# OBSOLETE   fr30-*-*)         sim_target=fr30 ;;
+  h8300*-*-*)          
+       sim_target=h8300 
+       extra_subdirs="${extra_subdirs} testsuite"
        ;;
-  fr30-*-*)            sim_target=fr30 ;;
-  h8300*-*-*)          sim_target=h8300 ;;
   h8500-*-*)           sim_target=h8500 ;;
   i960-*-*)            sim_target=i960 ;;
   m32r-*-*)            sim_target=m32r ;;
+  m68hc11-*-*|m6811-*-*) sim_target=m68hc11 ;;
+  mcore-*-*)           sim_target=mcore ;;
   mips*-*-*)
        # The MIPS simulator can only be compiled by gcc.
        sim_target=mips
@@ -77,7 +90,8 @@ case "${target}" in
        sim_target=mn10200
        ;;
   sh*-*-*)             sim_target=sh ;;
-  powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | powerpc*-*-elf* | powerpc*-*-linux* )
+  powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | \
+  powerpc*-*-elf* | powerpc*-*-linux* | powerpc*-*-netbsd* )
        # 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.
@@ -85,13 +99,11 @@ case "${target}" in
        only_if_gcc=yes
        #extra_subdirs="${extra_subdirs}"
        ;;
-# start-sanitize-tic80
   tic80-*-*)
        sim_target=tic80
        only_if_gcc=yes
        extra_subdirs="${extra_subdirs} igen"
        ;;
-# end-sanitize-tic80
   v850-*-*)
        # The V850 simulator can only be compiled by gcc.
        sim_target=v850
@@ -118,53 +130,25 @@ case "${target}" in
   z8k*-*-*)            sim_target=z8k ;;
   sparc64-*-*)
        only_if_gcc=yes
-       if test "x${with_cgen}" = xyes -o "x${with_cgen_sim}" = xyes ; then
-               sim_target=sparc
-               extra_subdirs="${extra_subdirs} testsuite"
-       else
-               sim_target=none # Don't build erc32 if sparc64.
-       fi
+       sim_target=none # Don't build erc32 if sparc64.
        ;;
   sparclite*-*-* | sparc86x*-*-*)
        # The SPARC simulator can only be compiled by gcc.
        only_if_gcc=yes
-       if test "x${with_cgen}" = xyes -o "x${with_cgen_sim}" = xyes ; then
-               sim_target=sparc
-               extra_subdirs="${extra_subdirs} testsuite"
-       else
-               sim_target=erc32
-       fi
+       sim_target=erc32
        ;;
   sparc*-*-*)
        # The SPARC simulator can only be compiled by gcc.
        only_if_gcc=yes
-       if test "x${with_cgen}" = xyes -o "x${with_cgen_sim}" = xyes ; then
-               sim_target=sparc
-               extra_subdirs="${extra_subdirs} testsuite"
-       else
-               # 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
-       fi
+       # 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
 
 
-# start-sanitize-gxsim
-AC_ARG_ENABLE(sim-gx, [],
-[case "${enableval}" in
-  yes) 
-    if test -d ${srcdir}/${sim_target}-gx ; then
-       extra_subdirs="${sim_target}-gx"
-    else
-       AC_MSG_WARN(GX simulator not available for ${sim_target})
-    fi ;;
-esac])dnl
-# end-sanitize-gxsim
-
-
 # Is there a testsuite directory for the target?
 testdir=`echo ${target} | sed -e 's/-.*-/-/'`
 if test -r ${srcdir}/testsuite/${testdir}/configure ; then