sim: merge configure.tgt into configure.ac

One fewer file to worry about & manage.

sim/ChangeLog

@@ -1,3 +1,9 @@
+2021-02-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.tgt: Move arch list ...
+	* configure.ac: ... here.
+	* configure: Regenerate.
+
 2021-02-19  Nelson Chu  <nelson.chu@sifive.com>
 
 	PR 27158

sim/configure

@@ -1833,8 +1833,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3847,245 +3845,139 @@ esac
 fi
 
 
-
 if test "${enable_sim}" != no; then
-
+  sim_igen=no
-# WHEN ADDING ENTRIES TO THIS MATRIX:
+  case "${target}" in
-
-# Make sure that the left side always has two dashes.  Otherwise you
-# can get spurious matches.  Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and
-# maintain.
-
-
-
-sim_igen=no
-sim_arch=
-case "${target}" in
     aarch64*-*-*)
 
-  sim_arch=aarch64
-
 
 subdirs="$subdirs aarch64"
 
-
       ;;
     arm*-*-*)
-
-  sim_arch=arm
       subdirs="$subdirs arm"
 
-
       ;;
     avr*-*-*)
-
-  sim_arch=avr
       subdirs="$subdirs avr"
 
-
       ;;
     bfin-*-*)
-
-  sim_arch=bfin
       subdirs="$subdirs bfin"
 
-
       ;;
     bpf-*-*)
-
-  sim_arch=bpf
       subdirs="$subdirs bpf"
 
-
       ;;
     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"
 
-
       ;;
     or1k-*-* | or1knd-*-*)
-
-  sim_arch=or1k
       subdirs="$subdirs or1k"
 
-
       ;;
     pru*-*-*)
-
-  sim_arch=pru
       subdirs="$subdirs pru"
 
-
       ;;
     riscv*-*-*)
-
-  sim_arch=riscv
       subdirs="$subdirs riscv"
 
-
       ;;
     rl78-*-*)
-
-  sim_arch=rl78
       subdirs="$subdirs rl78"
 
-
       ;;
     rx-*-*)
-
-  sim_arch=rx
       subdirs="$subdirs rx"
 
-
       ;;
     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
       ;;
-esac
+  esac
-
   if test "$sim_igen" = yes; then
     subdirs="$subdirs igen"
 

sim/configure.ac

@@ -37,12 +37,110 @@ yes | no) ;;
 *)	AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
 esac])
 
-m4_define([SIM_ARCH], [
+dnl WHEN ADDING ENTRIES TO THIS MATRIX:
-  sim_arch=$1
+dnl Make sure that the left side always has two dashes.  Otherwise you can get
-  AC_CONFIG_SUBDIRS($1)
+dnl spurious matches.  Even for unambiguous cases, do this as a convention, else
-])
+dnl the table becomes a real mess to understand and maintain.
 if test "${enable_sim}" != no; then
-  sinclude(configure.tgt)
+  sim_igen=no
+  case "${target}" in
+    aarch64*-*-*)
+      AC_CONFIG_SUBDIRS(aarch64)
+      ;;
+    arm*-*-*)
+      AC_CONFIG_SUBDIRS(arm)
+      ;;
+    avr*-*-*)
+      AC_CONFIG_SUBDIRS(avr)
+      ;;
+    bfin-*-*)
+      AC_CONFIG_SUBDIRS(bfin)
+      ;;
+    bpf-*-*)
+      AC_CONFIG_SUBDIRS(bpf)
+      ;;
+    cr16*-*-*)
+      AC_CONFIG_SUBDIRS(cr16)
+      ;;
+    cris-*-* | crisv32-*-*)
+      AC_CONFIG_SUBDIRS(cris)
+      ;;
+    d10v-*-*)
+      AC_CONFIG_SUBDIRS(d10v)
+      ;;
+    frv-*-*)
+      AC_CONFIG_SUBDIRS(frv)
+      ;;
+    h8300*-*-*)
+      AC_CONFIG_SUBDIRS(h8300)
+      ;;
+    iq2000-*-*)
+      AC_CONFIG_SUBDIRS(iq2000)
+      ;;
+    lm32-*-*)
+      AC_CONFIG_SUBDIRS(lm32)
+      ;;
+    m32c-*-*)
+      AC_CONFIG_SUBDIRS(m32c)
+      ;;
+    m32r-*-*)
+      AC_CONFIG_SUBDIRS(m32r)
+      ;;
+    m68hc11-*-*|m6811-*-*)
+      AC_CONFIG_SUBDIRS(m68hc11)
+      ;;
+    mcore-*-*)
+      AC_CONFIG_SUBDIRS(mcore)
+      ;;
+    microblaze-*-*)
+      AC_CONFIG_SUBDIRS(microblaze)
+      ;;
+    mips*-*-*)
+      AC_CONFIG_SUBDIRS(mips)
+      sim_igen=yes
+      ;;
+    mn10300*-*-*)
+      AC_CONFIG_SUBDIRS(mn10300)
+      sim_igen=yes
+      ;;
+    moxie-*-*)
+      AC_CONFIG_SUBDIRS(moxie)
+      ;;
+    msp430*-*-*)
+      AC_CONFIG_SUBDIRS(msp430)
+      ;;
+    or1k-*-* | or1knd-*-*)
+      AC_CONFIG_SUBDIRS(or1k)
+      ;;
+    pru*-*-*)
+      AC_CONFIG_SUBDIRS(pru)
+      ;;
+    riscv*-*-*)
+      AC_CONFIG_SUBDIRS(riscv)
+      ;;
+    rl78-*-*)
+      AC_CONFIG_SUBDIRS(rl78)
+      ;;
+    rx-*-*)
+      AC_CONFIG_SUBDIRS(rx)
+      ;;
+    sh*-*-*)
+      AC_CONFIG_SUBDIRS(sh)
+      ;;
+    sparc-*-rtems*|sparc-*-elf*)
+      AC_CONFIG_SUBDIRS(erc32)
+      ;;
+    powerpc*-*-*)
+      AC_CONFIG_SUBDIRS(ppc)
+      ;;
+    ft32-*-*)
+      AC_CONFIG_SUBDIRS(ft32)
+      ;;
+    v850*-*-*)
+      AC_CONFIG_SUBDIRS(v850)
+      sim_igen=yes
+      ;;
+  esac
   if test "$sim_igen" = yes; then
     AC_CONFIG_SUBDIRS(igen)
   fi

sim/configure.tgt

@@ -1,113 +0,0 @@
-dnl Note that this file is intended to be included at the m4 level and not
-dnl the shell level, so use sinclude(...) to pull it in.
-
-# WHEN ADDING ENTRIES TO THIS MATRIX:
-
-# Make sure that the left side always has two dashes.  Otherwise you
-# can get spurious matches.  Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and
-# maintain.
-
-dnl glue to avoid code duplication at top level
-m4_ifndef([SIM_ARCH], [AC_DEFUN([SIM_ARCH],[sim_arch=$1])])
-
-sim_igen=no
-sim_arch=
-case "${target}" in
-   aarch64*-*-*)
-       SIM_ARCH(aarch64)
-       ;;
-   arm*-*-*)
-       SIM_ARCH(arm)
-       ;;
-   avr*-*-*)
-       SIM_ARCH(avr)
-       ;;
-   bfin-*-*)
-       SIM_ARCH(bfin)
-       ;;
-   bpf-*-*)
-       SIM_ARCH(bpf)
-       ;;
-   cr16*-*-*)
-       SIM_ARCH(cr16)
-       ;;
-   cris-*-* | crisv32-*-*)
-       SIM_ARCH(cris)
-       ;;
-   d10v-*-*)
-       SIM_ARCH(d10v)
-       ;;
-   frv-*-*)
-       SIM_ARCH(frv)
-       ;;
-   h8300*-*-*)
-       SIM_ARCH(h8300)
-       ;;
-   iq2000-*-*)
-       SIM_ARCH(iq2000)
-       ;;
-   lm32-*-*)
-       SIM_ARCH(lm32)
-       ;;
-   m32c-*-*)
-       SIM_ARCH(m32c)
-       ;;
-   m32r-*-*)
-       SIM_ARCH(m32r)
-       ;;
-   m68hc11-*-*|m6811-*-*)
-       SIM_ARCH(m68hc11)
-       ;;
-   mcore-*-*)
-       SIM_ARCH(mcore)
-       ;;
-   microblaze-*-*)
-       SIM_ARCH(microblaze)
-       ;;
-   mips*-*-*)
-       SIM_ARCH(mips)
-       sim_igen=yes
-       ;;
-   mn10300*-*-*)
-       SIM_ARCH(mn10300)
-       sim_igen=yes
-       ;;
-   moxie-*-*)
-       SIM_ARCH(moxie)
-       ;;
-   msp430*-*-*)
-       SIM_ARCH(msp430)
-       ;;
-   or1k-*-* | or1knd-*-*)
-       SIM_ARCH(or1k)
-       ;;
-   pru*-*-*)
-       SIM_ARCH(pru)
-       ;;
-   riscv*-*-*)
-       SIM_ARCH(riscv)
-       ;;
-   rl78-*-*)
-       SIM_ARCH(rl78)
-       ;;
-   rx-*-*)
-       SIM_ARCH(rx)
-       ;;
-   sh*-*-*)
-       SIM_ARCH(sh)
-       ;;
-   sparc-*-rtems*|sparc-*-elf*)
-       SIM_ARCH(erc32)
-       ;;
-   powerpc*-*-*)
-       SIM_ARCH(ppc)
-       ;;
-   ft32-*-*)
-       SIM_ARCH(ft32)
-       ;;
-   v850*-*-*)
-       SIM_ARCH(v850)
-       sim_igen=yes
-       ;;
-esac