sim: use AS_HELP_STRING everywhere

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

diff --git a/sim/configure b/sim/configure
index be5e348d00ca7589bd252e009ceaab0e9d03da4a..a90d352fdbc97cb8aa562d7e0aaa7caa6305d43f 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -554,6 +554,7 @@ ac_unique_file="Makefile.in"
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_arch
 subdirs
 CFLAGS_FOR_BUILD
 CC_FOR_BUILD
@@ -635,6 +636,7 @@ LIBS
 CPPFLAGS'
 ac_subdirs_all='arm
 avr
+bfin
 cr16
 cris
 d10v
@@ -650,11 +652,14 @@ microblaze
 mips
 mn10300
 moxie
+msp430
+rl78
 rx
 sh64
 sh
 erc32
 ppc
+ft32
 v850
 testsuite
 common
@@ -1276,7 +1281,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim
+  --enable-sim            Enable the GNU simulator
 
 Some influential environment variables:
   CC          C compiler command
@@ -3604,6 +3609,9 @@ esac
 fi
 
 
+
+if test "${enable_sim}" != no; then
+
 # WHEN ADDING ENTRIES TO THIS MATRIX:
 
 # Make sure that the left side always has two dashes.  Otherwise you
@@ -3611,139 +3619,220 @@ fi
 # convention, else the table becomes a real mess to understand and
 # maintain.
 
-if test "${enable_sim}" != no; then
-   testsuite=no
-   common=yes
-   igen=no
-   case "${target}" in
-       arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+
+
+sim_common=yes
+sim_igen=no
+sim_arch=
+case "${target}" in
+   arm*-*-*)
+
+  sim_arch=arm
 
 
 subdirs="$subdirs arm"
 
-          testsuite=yes
-          ;;
-       avr*-*-*)
-           subdirs="$subdirs avr"
-
-          ;;
-       cr16*-*-*)
-          subdirs="$subdirs cr16"
-
-          testsuite=yes
-          ;;
-       cris-*-* | crisv32-*-*)
-          subdirs="$subdirs cris"
-
-          testsuite=yes
-          ;;
-       d10v-*-*)
-           subdirs="$subdirs d10v"
-
-          ;;
-       frv-*-*)
-           subdirs="$subdirs frv"
-
-          testsuite=yes
-          ;;
-       h8300*-*-*)
-           subdirs="$subdirs h8300"
-
-          testsuite=yes
-          ;;
-       iq2000-*-*)
-           subdirs="$subdirs iq2000"
-
-          testsuite=yes
-          ;;
-       lm32-*-*)
-           subdirs="$subdirs lm32"
-
-          testsuite=yes
-           ;;
-       m32c-*-*)
-           subdirs="$subdirs m32c"
-
-           ;;
-       m32r-*-*)
-           subdirs="$subdirs m32r"
-
-          testsuite=yes
-          ;;
-       m68hc11-*-*|m6811-*-*)
-           subdirs="$subdirs m68hc11"
-
-          testsuite=yes
-          ;;
-       mcore-*-*)
-           subdirs="$subdirs mcore"
-
-          testsuite=yes
-          ;;
-       microblaze-*-*)
-           subdirs="$subdirs microblaze"
-
-          testsuite=yes
-          ;;
-       mips*-*-*)
-           subdirs="$subdirs mips"
-
-          testsuite=yes
-          igen=yes
-          ;;
-       mn10300*-*-*)
-           subdirs="$subdirs mn10300"
-
-          igen=yes
-          ;;
-       moxie-*-*)
-          subdirs="$subdirs moxie"
-
-          testsuite=yes
-          ;;
-       rx-*-*)
-           subdirs="$subdirs rx"
-
-          ;;
-       sh64*-*-*)
-           subdirs="$subdirs sh64"
-
-          testsuite=yes
-          ;;
-       sh*-*-*)
-           subdirs="$subdirs sh"
-
-          testsuite=yes
-          ;;
-       sparc-*-rtems*|sparc-*-elf*)
-          subdirs="$subdirs erc32"
-
-          testsuite=yes
-          ;;
-       powerpc*-*-* )
-           subdirs="$subdirs ppc"
-
-          ;;
-       v850*-*-* )
-           subdirs="$subdirs v850"
-
-          igen=yes
-          testsuite=yes
-          ;;
-       *)
-          # No simulator subdir, so the subdir "common" isn't needed.
-          common=no
-          ;;
-   esac
-   if test "$testsuite" = yes; then
-      subdirs="$subdirs testsuite"
 
-   fi
-   if test "$common" = yes; then
+       ;;
+   avr*-*-*)
+
+  sim_arch=avr
+  subdirs="$subdirs avr"
+
+
+       ;;
+   bfin-*-*)
+
+  sim_arch=bfin
+  subdirs="$subdirs bfin"
+
+
+       ;;
+   cr16*-*-*)
+
+  sim_arch=cr16
+  subdirs="$subdirs cr16"
+
+
+       ;;
+   cris-*-* | crisv32-*-*)
+
+  sim_arch=cris
+  subdirs="$subdirs cris"
+
+
+       ;;
+   d10v-*-*)
+
+  sim_arch=d10v
+  subdirs="$subdirs d10v"
+
+
+       ;;
+   frv-*-*)
+
+  sim_arch=frv
+  subdirs="$subdirs frv"
+
+
+       ;;
+   h8300*-*-*)
+
+  sim_arch=h8300
+  subdirs="$subdirs h8300"
+
+
+       ;;
+   iq2000-*-*)
+
+  sim_arch=iq2000
+  subdirs="$subdirs iq2000"
+
+
+       ;;
+   lm32-*-*)
+
+  sim_arch=lm32
+  subdirs="$subdirs lm32"
+
+
+       ;;
+   m32c-*-*)
+
+  sim_arch=m32c
+  subdirs="$subdirs m32c"
+
+
+       ;;
+   m32r-*-*)
+
+  sim_arch=m32r
+  subdirs="$subdirs m32r"
+
+
+       ;;
+   m68hc11-*-*|m6811-*-*)
+
+  sim_arch=m68hc11
+  subdirs="$subdirs m68hc11"
+
+
+       ;;
+   mcore-*-*)
+
+  sim_arch=mcore
+  subdirs="$subdirs mcore"
+
+
+       ;;
+   microblaze-*-*)
+
+  sim_arch=microblaze
+  subdirs="$subdirs microblaze"
+
+
+       ;;
+   mips*-*-*)
+
+  sim_arch=mips
+  subdirs="$subdirs mips"
+
+
+       sim_igen=yes
+       ;;
+   mn10300*-*-*)
+
+  sim_arch=mn10300
+  subdirs="$subdirs mn10300"
+
+
+       sim_igen=yes
+       ;;
+   moxie-*-*)
+
+  sim_arch=moxie
+  subdirs="$subdirs moxie"
+
+
+       ;;
+   msp430*-*-*)
+
+  sim_arch=msp430
+  subdirs="$subdirs msp430"
+
+
+       ;;
+   rl78-*-*)
+
+  sim_arch=rl78
+  subdirs="$subdirs rl78"
+
+
+       ;;
+   rx-*-*)
+
+  sim_arch=rx
+  subdirs="$subdirs rx"
+
+
+       ;;
+   sh64*-*-*)
+
+  sim_arch=sh64
+  subdirs="$subdirs sh64"
+
+
+       ;;
+   sh*-*-*)
+
+  sim_arch=sh
+  subdirs="$subdirs sh"
+
+
+       ;;
+   sparc-*-rtems*|sparc-*-elf*)
+
+  sim_arch=erc32
+  subdirs="$subdirs erc32"
+
+
+       ;;
+   powerpc*-*-*)
+
+  sim_arch=ppc
+  subdirs="$subdirs ppc"
+
+
+       ;;
+   ft32-*-*)
+
+  sim_arch=ft32
+  subdirs="$subdirs ft32"
+
+
+       ;;
+   v850*-*-*)
+
+  sim_arch=v850
+  subdirs="$subdirs v850"
+
+
+       sim_igen=yes
+       ;;
+   *)
+       # No simulator subdir, so the subdir "common" isn't needed.
+       sim_common=no
+       ;;
+esac
+
+
+   subdirs="$subdirs testsuite"
+
+   if test "$sim_common" = yes; then
       subdirs="$subdirs common"
 
    fi
-   if test "$igen" = yes; then
+   if test "$sim_igen" = yes; then
       subdirs="$subdirs igen"
 
    fi