sim: use AS_HELP_STRING everywhere

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

diff --git a/sim/configure b/sim/configure
index 8fb62cb440eb934372a8ce4e529052cf1fbf572c..a90d352fdbc97cb8aa562d7e0aaa7caa6305d43f 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -652,12 +652,14 @@ microblaze
 mips
 mn10300
 moxie
+msp430
 rl78
 rx
 sh64
 sh
 erc32
 ppc
+ft32
 v850
 testsuite
 common
@@ -1279,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
@@ -3619,7 +3621,6 @@ if test "${enable_sim}" != no; then
 
 
 
-sim_testsuite=no
 sim_common=yes
 sim_igen=no
 sim_arch=
@@ -3632,7 +3633,6 @@ case "${target}" in
 subdirs="$subdirs arm"
 
 
-       sim_testsuite=yes
        ;;
    avr*-*-*)
 
@@ -3647,7 +3647,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs bfin"
 
 
-       sim_testsuite=yes
        ;;
    cr16*-*-*)
 
@@ -3655,7 +3654,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs cr16"
 
 
-       sim_testsuite=yes
        ;;
    cris-*-* | crisv32-*-*)
 
@@ -3663,7 +3661,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs cris"
 
 
-       sim_testsuite=yes
        ;;
    d10v-*-*)
 
@@ -3678,7 +3675,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs frv"
 
 
-       sim_testsuite=yes
        ;;
    h8300*-*-*)
 
@@ -3686,7 +3682,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs h8300"
 
 
-       sim_testsuite=yes
        ;;
    iq2000-*-*)
 
@@ -3694,7 +3689,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs iq2000"
 
 
-       sim_testsuite=yes
        ;;
    lm32-*-*)
 
@@ -3702,7 +3696,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs lm32"
 
 
-       sim_testsuite=yes
        ;;
    m32c-*-*)
 
@@ -3717,7 +3710,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs m32r"
 
 
-       sim_testsuite=yes
        ;;
    m68hc11-*-*|m6811-*-*)
 
@@ -3725,7 +3717,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs m68hc11"
 
 
-       sim_testsuite=yes
        ;;
    mcore-*-*)
 
@@ -3733,7 +3724,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs mcore"
 
 
-       sim_testsuite=yes
        ;;
    microblaze-*-*)
 
@@ -3741,7 +3731,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs microblaze"
 
 
-       sim_testsuite=yes
        ;;
    mips*-*-*)
 
@@ -3749,7 +3738,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs mips"
 
 
-       sim_testsuite=yes
        sim_igen=yes
        ;;
    mn10300*-*-*)
@@ -3766,12 +3754,11 @@ subdirs="$subdirs arm"
   subdirs="$subdirs moxie"
 
 
-       sim_testsuite=yes
        ;;
-   rx-*-*)
+   msp430*-*-*)
 
-  sim_arch=rx
-  subdirs="$subdirs rx"
+  sim_arch=msp430
+  subdirs="$subdirs msp430"
 
 
        ;;
@@ -3781,6 +3768,13 @@ subdirs="$subdirs arm"
   subdirs="$subdirs rl78"
 
 
+       ;;
+   rx-*-*)
+
+  sim_arch=rx
+  subdirs="$subdirs rx"
+
+
        ;;
    sh64*-*-*)
 
@@ -3788,7 +3782,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs sh64"
 
 
-       sim_testsuite=yes
        ;;
    sh*-*-*)
 
@@ -3796,7 +3789,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs sh"
 
 
-       sim_testsuite=yes
        ;;
    sparc-*-rtems*|sparc-*-elf*)
 
@@ -3804,7 +3796,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs erc32"
 
 
-       sim_testsuite=yes
        ;;
    powerpc*-*-*)
 
@@ -3812,6 +3803,13 @@ subdirs="$subdirs arm"
   subdirs="$subdirs ppc"
 
 
+       ;;
+   ft32-*-*)
+
+  sim_arch=ft32
+  subdirs="$subdirs ft32"
+
+
        ;;
    v850*-*-*)
 
@@ -3820,7 +3818,6 @@ subdirs="$subdirs arm"
 
 
        sim_igen=yes
-       sim_testsuite=yes
        ;;
    *)
        # No simulator subdir, so the subdir "common" isn't needed.
@@ -3829,10 +3826,8 @@ subdirs="$subdirs arm"
 esac
 
 
-   if test "$sim_testsuite" = yes; then
-      subdirs="$subdirs testsuite"
+   subdirs="$subdirs testsuite"
 
-   fi
    if test "$sim_common" = yes; then
       subdirs="$subdirs common"