X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=sim%2Fconfigure.ac;h=896791e97e766c444224ff694185b7d6f838bf62;hb=78f2c40a12179d26d3065c09f054b7e751b2732f;hp=9a55a0cc4ec5650b1bf9d1c8f5c18101d232aa92;hpb=d6416cdc2356231a0cf55ce7062ede13be5f5597;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/configure.ac b/sim/configure.ac
index 9a55a0cc4e..896791e97e 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -1,6 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
 m4_include([../config/override.m4])
-AC_PREREQ(2.59)dnl
 AC_INIT(Makefile.in)
 
 AC_PROG_CC
@@ -18,10 +17,12 @@ AC_SUBST(AR)
 AC_PROG_RANLIB
 
 # Put a plausible default for CC_FOR_BUILD in Makefile.
-if test "x$cross_compiling" = "xno"; then
-  CC_FOR_BUILD='$(CC)'
-else
-  CC_FOR_BUILD=gcc
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
 fi
 AC_SUBST(CC_FOR_BUILD)
 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -30,118 +31,20 @@ AC_SUBST(CFLAGS_FOR_BUILD)
 # If a cpu ever has more than one simulator to choose from, use
 # --enable-sim=... to choose.
 AC_ARG_ENABLE(sim,
-[  --enable-sim ],
+[AS_HELP_STRING([--enable-sim], [Enable the GNU simulator])],
 [case "${enableval}" in
 yes | no) ;;
 *)	AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
 esac])
 
-# WHEN ADDING ENTRIES TO THIS MATRIX:
-
-# Make sure that the left side always has two dashes.  Otherwise you
-# can get spurious matches.  Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and
-# maintain.
-
+m4_define([SIM_ARCH], [
+  sim_arch=$1
+  AC_CONFIG_SUBDIRS($1)
+])
 if test "${enable_sim}" != no; then
-   testsuite=no
-   common=yes
-   igen=no
-   case "${target}" in
-       arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
-           AC_CONFIG_SUBDIRS(arm)
-	   testsuite=yes
-	   ;;
-       avr*-*-*)
-           AC_CONFIG_SUBDIRS(avr)
-	   ;;
-       cr16*-*-*)
-	   AC_CONFIG_SUBDIRS(cr16)
-	   testsuite=yes
-	   ;;
-       cris-*-* | crisv32-*-*)
-	   AC_CONFIG_SUBDIRS(cris)
-	   testsuite=yes
-	   ;;
-       d10v-*-*)
-           AC_CONFIG_SUBDIRS(d10v)
-	   ;;
-       frv-*-*)
-           AC_CONFIG_SUBDIRS(frv)
-	   testsuite=yes
-	   ;;
-       h8300*-*-*)
-           AC_CONFIG_SUBDIRS(h8300)
-	   testsuite=yes
-	   ;;
-       iq2000-*-*)
-           AC_CONFIG_SUBDIRS(iq2000)
-	   testsuite=yes
-	   ;;
-       lm32-*-*)
-           AC_CONFIG_SUBDIRS(lm32)
-	   testsuite=yes
-           ;;
-       m32c-*-*)
-           AC_CONFIG_SUBDIRS(m32c)
-           ;;
-       m32r-*-*)
-           AC_CONFIG_SUBDIRS(m32r)
-	   testsuite=yes
-	   ;;
-       m68hc11-*-*|m6811-*-*)
-           AC_CONFIG_SUBDIRS(m68hc11)
-	   testsuite=yes
-	   ;;
-       mcore-*-*)
-           AC_CONFIG_SUBDIRS(mcore)
-	   testsuite=yes
-	   ;;
-       mips*-*-*)
-           AC_CONFIG_SUBDIRS(mips)
-	   testsuite=yes
-	   igen=yes
-	   ;;
-       mn10300*-*-*)
-           AC_CONFIG_SUBDIRS(mn10300)
-	   igen=yes
-	   ;;
-       moxie-*-*)
-	   AC_CONFIG_SUBDIRS(moxie)
-	   testsuite=yes
-	   ;;
-       sh64*-*-*)
-           AC_CONFIG_SUBDIRS(sh64)
-	   testsuite=yes
-	   ;;
-       sh*-*-*)
-           AC_CONFIG_SUBDIRS(sh)
-	   testsuite=yes
-	   ;;
-       sparc-*-rtems*|sparc-*-elf*)
-	   AC_CONFIG_SUBDIRS(erc32)
-	   testsuite=yes
-	   ;;
-       powerpc*-*-* )
-           AC_CONFIG_SUBDIRS(ppc)
-	   ;;
-       v850*-*-* )
-           AC_CONFIG_SUBDIRS(v850)
-	   igen=yes
-	   testsuite=yes
-	   ;;
-       *)
-	   # No simulator subdir, so the subdir "common" isn't needed.
-	   common=no
-	   ;;
-   esac
-   if test "$testsuite" = yes; then
-      AC_CONFIG_SUBDIRS(testsuite)
-   fi
-   if test "$common" = yes; then
-      AC_CONFIG_SUBDIRS(common)
-   fi
-   if test "$igen" = yes; then
+   sinclude(configure.tgt)
+   AC_CONFIG_SUBDIRS(testsuite)
+   if test "$sim_igen" = yes; then
       AC_CONFIG_SUBDIRS(igen)
    fi
 fi