sim: update configure target list

Fix sorting of the list, and update the globs to match the list used
in gdb's configure script.

diff --git a/sim/configure b/sim/configure
index 8dec72cf3b40621545bd9f39ed8b59db44c3c550..44b34e7bc60531fb063472f4699cfc53cf636492 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -867,8 +867,8 @@ ac_subdirs_all='bpf
 mips
 mn10300
 or1k
-riscv
 ppc
+riscv
 v850'
 
 # Initialize some variables set by options.
@@ -11386,7 +11386,7 @@ haiku*)
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LIBRARY_PATH
   shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -14028,7 +14028,7 @@ subdirs="$subdirs bpf"
   esac
 
       case "${targ}" in
-    all|microblaze-*-*)
+    all|microblaze*-*-*)
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=microblaze
       fi
@@ -14112,7 +14112,7 @@ subdirs="$subdirs bpf"
   esac
 
       case "${targ}" in
-    all|or1k-*-* | or1knd-*-*)
+    all|or1k*-*-*)
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=or1k
       fi
@@ -14123,6 +14123,21 @@ subdirs="$subdirs bpf"
 
 
 
+      ;;
+  esac
+
+      case "${targ}" in
+    all|powerpc*-*-*)
+      if test "${targ}" = "${target}"; then
+        SIM_PRIMARY_TARGET=ppc
+      fi
+            subdirs="$subdirs ppc"
+
+
+    ac_config_commands="$ac_config_commands depdir-ppc"
+
+
+
       ;;
   esac
 
@@ -14214,7 +14229,7 @@ subdirs="$subdirs bpf"
   esac
 
       case "${targ}" in
-    all|sparc-*-rtems*|sparc-*-elf*)
+    all|sparc-*-*)
       if test "${targ}" = "${target}"; then
         SIM_PRIMARY_TARGET=erc32
       fi
@@ -14228,21 +14243,6 @@ subdirs="$subdirs bpf"
 
 
 
-      ;;
-  esac
-
-      case "${targ}" in
-    all|powerpc*-*-*)
-      if test "${targ}" = "${target}"; then
-        SIM_PRIMARY_TARGET=ppc
-      fi
-            subdirs="$subdirs ppc"
-
-
-    ac_config_commands="$ac_config_commands depdir-ppc"
-
-
-
       ;;
   esac
 
@@ -15882,6 +15882,7 @@ do
     "msp430/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS msp430/Makefile" ;;
     "depdir-msp430") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-msp430" ;;
     "depdir-or1k") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-or1k" ;;
+    "depdir-ppc") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-ppc" ;;
     "pru/Makefile.sim") CONFIG_FILES="$CONFIG_FILES pru/Makefile.sim:pru/Makefile.in" ;;
     "pru/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS pru/Makefile" ;;
     "depdir-pru") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-pru" ;;
@@ -15898,7 +15899,6 @@ do
     "erc32/Makefile.sim") CONFIG_FILES="$CONFIG_FILES erc32/Makefile.sim:erc32/Makefile.in" ;;
     "erc32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS erc32/Makefile" ;;
     "depdir-erc32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-erc32" ;;
-    "depdir-ppc") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-ppc" ;;
     "depdir-v850") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-v850" ;;
     "example-synacor/Makefile.sim") CONFIG_FILES="$CONFIG_FILES example-synacor/Makefile.sim:example-synacor/Makefile.in" ;;
     "example-synacor/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS example-synacor/Makefile" ;;
@@ -17483,6 +17483,7 @@ $as_echo X"$file" |
  ;;
     "depdir-msp430":C) $SHELL $ac_aux_dir/mkinstalldirs msp430/$DEPDIR ;;
     "depdir-or1k":C) $SHELL $ac_aux_dir/mkinstalldirs or1k/$DEPDIR ;;
+    "depdir-ppc":C) $SHELL $ac_aux_dir/mkinstalldirs ppc/$DEPDIR ;;
     "pru/Makefile":C) sed -n \
        -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
                /^srcdir = / s:$:/pru:
@@ -17549,7 +17550,6 @@ $as_echo X"$file" |
  rm -f erc32/Makesim1.tmp erc32/Makesim2.tmp
  ;;
     "depdir-erc32":C) $SHELL $ac_aux_dir/mkinstalldirs erc32/$DEPDIR ;;
-    "depdir-ppc":C) $SHELL $ac_aux_dir/mkinstalldirs ppc/$DEPDIR ;;
     "depdir-v850":C) $SHELL $ac_aux_dir/mkinstalldirs v850/$DEPDIR ;;
     "example-synacor/Makefile":C) sed -n \
        -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {

diff --git a/sim/configure.ac b/sim/configure.ac
index 098d88bc01ef3ad6979b8cfc16196e4411a6ad71..5d36e5556d342d922b31413f6fc0db25ff5f9ae9 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -107,6 +107,9 @@ dnl WHEN ADDING ENTRIES TO THIS MATRIX:
 dnl Make sure that the left side always has two dashes.  Otherwise you can get
 dnl spurious matches.  Even for unambiguous cases, do this as a convention, else
 dnl the table becomes a real mess to understand and maintain.
+dnl
+dnl NB: Target matching is aligned with gdb/configure.tgt.  Changes must be kept
+dnl in sync with that file.
 if test "${enable_sim}" != no; then
   sim_igen=no
   for targ in `echo $target $enable_targets | sed 's/,/ /g'`
@@ -128,19 +131,19 @@ if test "${enable_sim}" != no; then
     SIM_TARGET([m32r-*-*], [m32r])
     SIM_TARGET([m68hc11-*-*|m6811-*-*], [m68hc11])
     SIM_TARGET([mcore-*-*], [mcore])
-    SIM_TARGET([microblaze-*-*], [microblaze])
+    SIM_TARGET([microblaze*-*-*], [microblaze])
     SIM_TARGET([mips*-*-*], [mips], [true], [sim_igen=yes])
     SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes])
     SIM_TARGET([moxie-*-*], [moxie])
     SIM_TARGET([msp430*-*-*], [msp430])
-    SIM_TARGET([or1k-*-* | or1knd-*-*], [or1k], [true])
+    SIM_TARGET([or1k*-*-*], [or1k], [true])
+    SIM_TARGET([powerpc*-*-*], [ppc], [true])
     SIM_TARGET([pru*-*-*], [pru])
     SIM_TARGET([riscv*-*-*], [riscv], [true])
     SIM_TARGET([rl78-*-*], [rl78])
     SIM_TARGET([rx-*-*], [rx])
     SIM_TARGET([sh*-*-*], [sh])
-    SIM_TARGET([sparc-*-rtems*|sparc-*-elf*], [erc32])
-    SIM_TARGET([powerpc*-*-*], [ppc], [true])
+    SIM_TARGET([sparc-*-*], [erc32])
     SIM_TARGET([v850*-*-*], [v850], [true], [sim_igen=yes])
   done