Bring in support for the NFP target in the config.sub file.

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

diff --git a/sim/configure b/sim/configure
index 3447321ffa7befab1b877711e36b008502f7e9d0..b90152e7fbea3c5fbf9fcc7f6c0f16ab079209f8 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -653,6 +653,7 @@ microblaze
 mips
 mn10300
 moxie
+or1k
 msp430
 rl78
 rx
@@ -663,7 +664,6 @@ ppc
 ft32
 v850
 testsuite
-common
 igen'
 
 # Initialize some variables set by options.
@@ -3590,10 +3590,12 @@ fi
 
 
 # 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
 
 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
@@ -3622,7 +3624,6 @@ if test "${enable_sim}" != no; then
 
 
 
-sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
@@ -3769,6 +3770,14 @@ subdirs="$subdirs aarch64"
   subdirs="$subdirs msp430"
 
 
+       ;;
+   or1k-*-* | or1knd-*-*)
+
+  sim_arch=or1k
+  subdirs="$subdirs or1k"
+
+
+       sim_testsuite=yes
        ;;
    rl78-*-*)
 
@@ -3827,19 +3836,11 @@ subdirs="$subdirs aarch64"
 
        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 "$sim_igen" = yes; then
       subdirs="$subdirs igen"