[ARC] Fix and extend features of .cpu directive.

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

diff --git a/sim/configure b/sim/configure
index a40c7fd7c5712f22307067c3774a8c10550d68c6..2729e698171b1c996a5f99dc83c2720330559ca4 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -634,7 +634,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='arm
+ac_subdirs_all='aarch64
+arm
 avr
 bfin
 cr16
@@ -662,7 +663,6 @@ ppc
 ft32
 v850
 testsuite
-common
 igen'
 
 # Initialize some variables set by options.
@@ -1281,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
@@ -3621,20 +3621,24 @@ if test "${enable_sim}" != no; then
 
 
 
-sim_testsuite=no
-sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
-   arm*-*-*)
+   aarch64*-*-*)
+
+  sim_arch=aarch64
 
-  sim_arch=arm
 
+subdirs="$subdirs aarch64"
+
+
+       ;;
+   arm*-*-*)
 
-subdirs="$subdirs arm"
+  sim_arch=arm
+  subdirs="$subdirs arm"
 
 
-       sim_testsuite=yes
        ;;
    avr*-*-*)
 
@@ -3642,7 +3646,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs avr"
 
 
-       sim_testsuite=yes
        ;;
    bfin-*-*)
 
@@ -3650,7 +3653,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs bfin"
 
 
-       sim_testsuite=yes
        ;;
    cr16*-*-*)
 
@@ -3658,7 +3660,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs cr16"
 
 
-       sim_testsuite=yes
        ;;
    cris-*-* | crisv32-*-*)
 
@@ -3666,7 +3667,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs cris"
 
 
-       sim_testsuite=yes
        ;;
    d10v-*-*)
 
@@ -3681,7 +3681,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs frv"
 
 
-       sim_testsuite=yes
        ;;
    h8300*-*-*)
 
@@ -3689,7 +3688,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs h8300"
 
 
-       sim_testsuite=yes
        ;;
    iq2000-*-*)
 
@@ -3697,7 +3695,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs iq2000"
 
 
-       sim_testsuite=yes
        ;;
    lm32-*-*)
 
@@ -3705,7 +3702,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs lm32"
 
 
-       sim_testsuite=yes
        ;;
    m32c-*-*)
 
@@ -3720,7 +3716,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs m32r"
 
 
-       sim_testsuite=yes
        ;;
    m68hc11-*-*|m6811-*-*)
 
@@ -3728,7 +3723,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs m68hc11"
 
 
-       sim_testsuite=yes
        ;;
    mcore-*-*)
 
@@ -3736,7 +3730,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs mcore"
 
 
-       sim_testsuite=yes
        ;;
    microblaze-*-*)
 
@@ -3744,7 +3737,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs microblaze"
 
 
-       sim_testsuite=yes
        ;;
    mips*-*-*)
 
@@ -3752,7 +3744,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs mips"
 
 
-       sim_testsuite=yes
        sim_igen=yes
        ;;
    mn10300*-*-*)
@@ -3769,7 +3760,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs moxie"
 
 
-       sim_testsuite=yes
        ;;
    msp430*-*-*)
 
@@ -3777,7 +3767,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs msp430"
 
 
-       sim_testsuite=yes
        ;;
    rl78-*-*)
 
@@ -3799,7 +3788,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs sh64"
 
 
-       sim_testsuite=yes
        ;;
    sh*-*-*)
 
@@ -3807,7 +3795,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs sh"
 
 
-       sim_testsuite=yes
        ;;
    sparc-*-rtems*|sparc-*-elf*)
 
@@ -3815,7 +3802,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs erc32"
 
 
-       sim_testsuite=yes
        ;;
    powerpc*-*-*)
 
@@ -3830,7 +3816,6 @@ subdirs="$subdirs arm"
   subdirs="$subdirs ft32"
 
 
-       sim_testsuite=yes
        ;;
    v850*-*-*)
 
@@ -3839,23 +3824,12 @@ subdirs="$subdirs arm"
 
 
        sim_igen=yes
-       sim_testsuite=yes
-       ;;
-   *)
-       # No simulator subdir, so the subdir "common" isn't needed.
-       sim_common=no
        ;;
 esac
 
 
-   if test "$sim_testsuite" = yes; then
-      subdirs="$subdirs testsuite"
+   subdirs="$subdirs testsuite"
 
-   fi
-   if test "$sim_common" = yes; then
-      subdirs="$subdirs common"
-
-   fi
    if test "$sim_igen" = yes; then
       subdirs="$subdirs igen"