From: Mike Frysinger Date: Sat, 16 Jan 2021 05:03:32 +0000 (-0500) Subject: sim: merge configure.tgt into configure.ac X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3e8bb3e934bf6eb24e7914880a30bda3f175583b;p=binutils-gdb.git sim: merge configure.tgt into configure.ac One fewer file to worry about & manage. --- diff --git a/sim/ChangeLog b/sim/ChangeLog index 6bea868a74a..0014a9a6ac9 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,9 @@ +2021-02-20 Mike Frysinger + + * configure.tgt: Move arch list ... + * configure.ac: ... here. + * configure: Regenerate. + 2021-02-19 Nelson Chu PR 27158 diff --git a/sim/configure b/sim/configure index a7747268d3b..500fffb2f7d 100755 --- a/sim/configure +++ b/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 - -# 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. - - - -sim_igen=no -sim_arch= -case "${target}" in - aarch64*-*-*) - - sim_arch=aarch64 + sim_igen=no + case "${target}" in + aarch64*-*-*) subdirs="$subdirs aarch64" + ;; + arm*-*-*) + subdirs="$subdirs arm" - ;; - 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" - + ;; + avr*-*-*) + subdirs="$subdirs avr" - ;; - pru*-*-*) + ;; + bfin-*-*) + subdirs="$subdirs bfin" - sim_arch=pru - subdirs="$subdirs pru" + ;; + bpf-*-*) + subdirs="$subdirs bpf" + ;; + cr16*-*-*) + subdirs="$subdirs cr16" - ;; - riscv*-*-*) + ;; + cris-*-* | crisv32-*-*) + subdirs="$subdirs cris" - sim_arch=riscv - subdirs="$subdirs riscv" + ;; + d10v-*-*) + subdirs="$subdirs d10v" + ;; + frv-*-*) + subdirs="$subdirs frv" - ;; - rl78-*-*) + ;; + h8300*-*-*) + subdirs="$subdirs h8300" - sim_arch=rl78 - subdirs="$subdirs rl78" + ;; + iq2000-*-*) + subdirs="$subdirs iq2000" + ;; + lm32-*-*) + subdirs="$subdirs lm32" - ;; - rx-*-*) + ;; + m32c-*-*) + subdirs="$subdirs m32c" - sim_arch=rx - subdirs="$subdirs rx" + ;; + m32r-*-*) + subdirs="$subdirs m32r" + ;; + m68hc11-*-*|m6811-*-*) + subdirs="$subdirs m68hc11" - ;; - sh*-*-*) + ;; + mcore-*-*) + subdirs="$subdirs mcore" - sim_arch=sh - subdirs="$subdirs sh" + ;; + microblaze-*-*) + subdirs="$subdirs microblaze" + ;; + mips*-*-*) + subdirs="$subdirs mips" - ;; - sparc-*-rtems*|sparc-*-elf*) + sim_igen=yes + ;; + mn10300*-*-*) + subdirs="$subdirs mn10300" - sim_arch=erc32 - subdirs="$subdirs erc32" + sim_igen=yes + ;; + moxie-*-*) + subdirs="$subdirs moxie" + ;; + msp430*-*-*) + subdirs="$subdirs msp430" - ;; - powerpc*-*-*) + ;; + or1k-*-* | or1knd-*-*) + subdirs="$subdirs or1k" - sim_arch=ppc - subdirs="$subdirs ppc" + ;; + pru*-*-*) + subdirs="$subdirs pru" + ;; + riscv*-*-*) + subdirs="$subdirs riscv" - ;; - ft32-*-*) + ;; + rl78-*-*) + subdirs="$subdirs rl78" - sim_arch=ft32 - subdirs="$subdirs ft32" + ;; + rx-*-*) + subdirs="$subdirs rx" + ;; + sh*-*-*) + subdirs="$subdirs sh" - ;; - v850*-*-*) + ;; + sparc-*-rtems*|sparc-*-elf*) + subdirs="$subdirs erc32" - sim_arch=v850 - subdirs="$subdirs v850" + ;; + powerpc*-*-*) + subdirs="$subdirs ppc" + ;; + ft32-*-*) + subdirs="$subdirs ft32" - sim_igen=yes - ;; -esac + ;; + v850*-*-*) + subdirs="$subdirs v850" + sim_igen=yes + ;; + esac if test "$sim_igen" = yes; then subdirs="$subdirs igen" diff --git a/sim/configure.ac b/sim/configure.ac index 70cd86c6909..80e1b42d40b 100644 --- a/sim/configure.ac +++ b/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], [ - sim_arch=$1 - AC_CONFIG_SUBDIRS($1) -]) +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. 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 diff --git a/sim/configure.tgt b/sim/configure.tgt deleted file mode 100644 index e5acc797316..00000000000 --- a/sim/configure.tgt +++ /dev/null @@ -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