Fix autoconf breakage + commit target.c, omitted in previous delta

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

diff --git a/sim/configure.in b/sim/configure.in
index aa7b6d14d806ae3b158afa5ae710710162035127..e472f8862b90273a0834ae00e86b3e1851b061e8 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.5)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,19 +46,31 @@ extra_subdirs=common
 #  convention, else the table becomes a real mess to understand and maintain.
 
 case "${target}" in
-  arm*-*-*)            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 ;;
-# start-sanitize-d30v
   d30v-*-*)
        sim_target=d30v
        only_if_gcc=yes
        extra_subdirs="${extra_subdirs} igen"
        ;;
-# end-sanitize-d30v
+  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
@@ -70,6 +81,7 @@ case "${target}" in
        # 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
@@ -83,20 +95,17 @@ 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
        extra_subdirs="${extra_subdirs} igen"
        only_if_gcc=yes
        ;;
-# start-sanitize-v850e
   v850e-*-*)
        # The V850 simulator can only be compiled by gcc.
        sim_target=v850
@@ -109,7 +118,6 @@ case "${target}" in
        extra_subdirs="${extra_subdirs} igen"
        only_if_gcc=yes
        ;;
-# end-sanitize-v850e
   w65-*-*)
        sim_target=w65
        # The w65 is suffering from gradual decay.
@@ -117,15 +125,21 @@ case "${target}" in
        ;;
   z8k*-*-*)            sim_target=z8k ;;
   sparc64-*-*)
+       only_if_gcc=yes
        sim_target=none # Don't build erc32 if sparc64.
        ;;
-  sparc*-*-*)
+  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