From c4d800aeba67226118c302aa4b4c7cff125c0856 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Thu, 21 Dec 2006 02:37:17 +0000
Subject: [PATCH] 	* configure.ac (common): Make the default "yes" for
 all targets 	with sim subdirs. 	* configure: Regenerate.

---
 sim/ChangeLog    |  4 ++++
 sim/configure    | 22 +++++-----------------
 sim/configure.ac | 22 +++++-----------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/sim/ChangeLog b/sim/ChangeLog
index a773c120e98..72824aa0567 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-20  Hans-Peter Nilsson  <hp@axis.com>
 
+	* configure.ac (common): Make the default "yes" for all targets
+	with sim subdirs.
+	* configure: Regenerate.
+
 	* Makefile.in (autoconf-common autoheader-common): In documented
 	usage, say SHELL=/bin/sh.
 	(.PHONY): Add autoheader-common.
diff --git a/sim/configure b/sim/configure
index cc9a9151206..1e6ef3d975d 100755
--- a/sim/configure
+++ b/sim/configure
@@ -3413,7 +3413,7 @@ fi;
 
 if test "${enable_sim}" != no; then
    testsuite=no
-   common=no
+   common=yes
    igen=no
    case "${target}" in
        arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
@@ -3422,7 +3422,6 @@ if test "${enable_sim}" != no; then
 subdirs="$subdirs arm"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        cris-*-* | crisv32-*-*)
 
@@ -3430,7 +3429,6 @@ subdirs="$subdirs arm"
 subdirs="$subdirs cris"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        d10v-*-*)
 
@@ -3444,7 +3442,6 @@ subdirs="$subdirs d10v"
 subdirs="$subdirs frv"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        h8300*-*-*)
 
@@ -3452,7 +3449,6 @@ subdirs="$subdirs frv"
 subdirs="$subdirs h8300"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        iq2000-*-*)
 
@@ -3460,14 +3456,12 @@ subdirs="$subdirs h8300"
 subdirs="$subdirs iq2000"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        m32c-*-*)
 
 
 subdirs="$subdirs m32c"
 
-           common=yes
            ;;
        m32r-*-*)
 
@@ -3475,7 +3469,6 @@ subdirs="$subdirs m32c"
 subdirs="$subdirs m32r"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        m68hc11-*-*|m6811-*-*)
 
@@ -3483,7 +3476,6 @@ subdirs="$subdirs m32r"
 subdirs="$subdirs m68hc11"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        mcore-*-*)
 
@@ -3491,7 +3483,6 @@ subdirs="$subdirs m68hc11"
 subdirs="$subdirs mcore"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        mips*-*-*)
 
@@ -3499,7 +3490,6 @@ subdirs="$subdirs mcore"
 subdirs="$subdirs mips"
 
 	   testsuite=yes
-	   common=yes
 	   igen=yes
 	   ;;
        mn10300*-*-*)
@@ -3507,7 +3497,6 @@ subdirs="$subdirs mips"
 
 subdirs="$subdirs mn10300"
 
-	   common=yes
 	   igen=yes
 	   ;;
        sh64-*-*)
@@ -3516,7 +3505,6 @@ subdirs="$subdirs mn10300"
 subdirs="$subdirs sh64"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        sh-*-*)
 
@@ -3524,7 +3512,6 @@ subdirs="$subdirs sh64"
 subdirs="$subdirs sh"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        sparc-*-rtems*|sparc-*-elf*)
 
@@ -3532,23 +3519,24 @@ subdirs="$subdirs sh"
 subdirs="$subdirs erc32"
 
 	   testsuite=yes
-	   common=yes
 	   ;;
        powerpc*-*-* )
 
 
 subdirs="$subdirs ppc"
 
-	   common=yes
 	   ;;
        v850*-*-* )
 
 
 subdirs="$subdirs v850"
 
-	   common=yes
 	   igen=yes
 	   ;;
+       *)
+	   # No simulator subdir, so the subdir "common" isn't needed.
+	   common=no
+	   ;;
    esac
    if test "$testsuite" = yes; then
 
diff --git a/sim/configure.ac b/sim/configure.ac
index b58206e9426..c20d847c591 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -44,18 +44,16 @@ esac])
 
 if test "${enable_sim}" != no; then
    testsuite=no
-   common=no
+   common=yes
    igen=no
    case "${target}" in
        arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
            AC_CONFIG_SUBDIRS(arm)
 	   testsuite=yes
-	   common=yes
 	   ;;
        cris-*-* | crisv32-*-*)
 	   AC_CONFIG_SUBDIRS(cris)
 	   testsuite=yes
-	   common=yes
 	   ;;
        d10v-*-*)
            AC_CONFIG_SUBDIRS(d10v)
@@ -63,72 +61,62 @@ if test "${enable_sim}" != no; then
        frv-*-*)
            AC_CONFIG_SUBDIRS(frv)
 	   testsuite=yes
-	   common=yes
 	   ;;
        h8300*-*-*)
            AC_CONFIG_SUBDIRS(h8300)
 	   testsuite=yes
-	   common=yes
 	   ;;
        iq2000-*-*)
            AC_CONFIG_SUBDIRS(iq2000)
 	   testsuite=yes
-	   common=yes
 	   ;;
        m32c-*-*)
            AC_CONFIG_SUBDIRS(m32c)
-           common=yes
            ;;
        m32r-*-*)
            AC_CONFIG_SUBDIRS(m32r)
 	   testsuite=yes
-	   common=yes
 	   ;;
        m68hc11-*-*|m6811-*-*)
            AC_CONFIG_SUBDIRS(m68hc11)
 	   testsuite=yes
-	   common=yes
 	   ;;
        mcore-*-*)
            AC_CONFIG_SUBDIRS(mcore)
 	   testsuite=yes
-	   common=yes
 	   ;;
        mips*-*-*)
            AC_CONFIG_SUBDIRS(mips)
 	   testsuite=yes
-	   common=yes
 	   igen=yes
 	   ;;
        mn10300*-*-*)
            AC_CONFIG_SUBDIRS(mn10300)
-	   common=yes
 	   igen=yes
 	   ;;
        sh64-*-*)
            AC_CONFIG_SUBDIRS(sh64)
 	   testsuite=yes
-	   common=yes
 	   ;;
        sh-*-*)
            AC_CONFIG_SUBDIRS(sh)
 	   testsuite=yes
-	   common=yes
 	   ;;
        sparc-*-rtems*|sparc-*-elf*)
 	   AC_CONFIG_SUBDIRS(erc32)
 	   testsuite=yes
-	   common=yes
 	   ;;
        powerpc*-*-* )
            AC_CONFIG_SUBDIRS(ppc)
-	   common=yes
 	   ;;
        v850*-*-* )
            AC_CONFIG_SUBDIRS(v850)
-	   common=yes
 	   igen=yes
 	   ;;
+       *)
+	   # No simulator subdir, so the subdir "common" isn't needed.
+	   common=no
+	   ;;
    esac
    if test "$testsuite" = yes; then
       AC_CONFIG_SUBDIRS(testsuite)
-- 
2.30.2