From fd95c73ef5a6c4386b599d4a796377bc065ed6b6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 15:05:18 -0500 Subject: [PATCH] sim: disable recursive make in (most) subdirs Now that all (other than ppc) build in the top-level, we can disable the recursive make calls to them. This speeds things up nicely. --- sim/Makefile.am | 2 +- sim/Makefile.in | 97 +------- sim/configure | 600 +---------------------------------------------- sim/configure.ac | 21 -- 4 files changed, 13 insertions(+), 707 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index fa646ab1b05..29086d22d68 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -24,7 +24,7 @@ GNULIB_PARENT_DIR = .. srccom = $(srcdir)/common srcroot = $(srcdir)/.. -SUBDIRS = @subdirs@ $(SIM_SUBDIRS) +SUBDIRS = @subdirs@ SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@ AM_MAKEFLAGS = diff --git a/sim/Makefile.in b/sim/Makefile.in index c13239058bc..94d699bb00d 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -377,27 +377,15 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = Make-common.sim aarch64/Makefile.sim \ - aarch64/.gdbinit arm/Makefile.sim arm/.gdbinit \ - avr/Makefile.sim avr/.gdbinit bfin/Makefile.sim bfin/.gdbinit \ - bpf/Makefile.sim bpf/.gdbinit cr16/Makefile.sim cr16/.gdbinit \ - cris/Makefile.sim cris/.gdbinit d10v/Makefile.sim \ - d10v/.gdbinit frv/Makefile.sim frv/.gdbinit ft32/Makefile.sim \ - ft32/.gdbinit h8300/Makefile.sim h8300/.gdbinit \ - iq2000/Makefile.sim iq2000/.gdbinit lm32/Makefile.sim \ - lm32/.gdbinit m32c/Makefile.sim m32c/.gdbinit \ - m32r/Makefile.sim m32r/.gdbinit m68hc11/Makefile.sim \ - m68hc11/.gdbinit mcore/Makefile.sim mcore/.gdbinit \ - microblaze/Makefile.sim microblaze/.gdbinit mips/Makefile.sim \ - mips/.gdbinit mn10300/Makefile.sim mn10300/.gdbinit \ - moxie/Makefile.sim moxie/.gdbinit msp430/Makefile.sim \ - msp430/.gdbinit or1k/Makefile.sim or1k/.gdbinit ppc/.gdbinit \ - pru/Makefile.sim pru/.gdbinit riscv/Makefile.sim \ - riscv/.gdbinit rl78/Makefile.sim rl78/.gdbinit rx/Makefile.sim \ - rx/.gdbinit sh/Makefile.sim sh/.gdbinit erc32/Makefile.sim \ - erc32/.gdbinit v850/Makefile.sim v850/.gdbinit \ - example-synacor/Makefile.sim example-synacor/.gdbinit \ - arch-subdir.mk .gdbinit +CONFIG_CLEAN_FILES = aarch64/.gdbinit arm/.gdbinit avr/.gdbinit \ + bfin/.gdbinit bpf/.gdbinit cr16/.gdbinit cris/.gdbinit \ + d10v/.gdbinit frv/.gdbinit ft32/.gdbinit h8300/.gdbinit \ + iq2000/.gdbinit lm32/.gdbinit m32c/.gdbinit m32r/.gdbinit \ + m68hc11/.gdbinit mcore/.gdbinit microblaze/.gdbinit \ + mips/.gdbinit mn10300/.gdbinit moxie/.gdbinit msp430/.gdbinit \ + or1k/.gdbinit ppc/.gdbinit pru/.gdbinit riscv/.gdbinit \ + rl78/.gdbinit rx/.gdbinit sh/.gdbinit erc32/.gdbinit \ + v850/.gdbinit example-synacor/.gdbinit arch-subdir.mk .gdbinit CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru @@ -1690,7 +1678,6 @@ SIM_MIPS_SUBTARGET = @SIM_MIPS_SUBTARGET@ SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@ SIM_RISCV_BITSIZE = @SIM_RISCV_BITSIZE@ SIM_RX_CYCLE_ACCURATE_FLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@ -SIM_SUBDIRS = @SIM_SUBDIRS@ SIM_TOOLCHAIN_VARS = @SIM_TOOLCHAIN_VARS@ STRIP = @STRIP@ TERMCAP_LIB = @TERMCAP_LIB@ @@ -1762,7 +1749,7 @@ ACLOCAL_AMFLAGS = -Im4 -I.. -I../config GNULIB_PARENT_DIR = .. srccom = $(srcdir)/common srcroot = $(srcdir)/.. -SUBDIRS = @subdirs@ $(SIM_SUBDIRS) +SUBDIRS = @subdirs@ AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \ $(am__append_3) $(am__append_16) $(am__append_30) \ $(am__append_63) $(am__append_74) $(am__append_80) \ @@ -3018,132 +3005,68 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -Make-common.sim: $(top_builddir)/config.status $(top_srcdir)/common/Make-common.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -aarch64/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/aarch64/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ aarch64/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -arm/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/arm/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ arm/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -avr/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/avr/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ avr/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -bfin/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/bfin/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ bfin/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -bpf/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/bpf/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ bpf/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -cr16/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/cr16/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ cr16/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -cris/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/cris/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ cris/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -d10v/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/d10v/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ d10v/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -frv/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/frv/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ frv/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -ft32/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/ft32/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ ft32/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -h8300/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/h8300/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ h8300/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -iq2000/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/iq2000/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ iq2000/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -lm32/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/lm32/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ lm32/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -m32c/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m32c/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ m32c/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -m32r/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m32r/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ m32r/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -m68hc11/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m68hc11/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ m68hc11/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -mcore/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/mcore/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mcore/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -microblaze/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/microblaze/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ microblaze/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -mips/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/mips/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mips/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -mn10300/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/mn10300/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mn10300/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -moxie/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/moxie/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ moxie/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -msp430/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/msp430/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ msp430/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -or1k/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/or1k/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ or1k/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ ppc/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -pru/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/pru/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ pru/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -riscv/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/riscv/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ riscv/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -rl78/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/rl78/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ rl78/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -rx/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/rx/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ rx/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -sh/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/sh/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ sh/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -erc32/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/erc32/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ erc32/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -v850/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/v850/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ v850/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ -example-synacor/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/example-synacor/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ example-synacor/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in cd $(top_builddir) && $(SHELL) ./config.status $@ arch-subdir.mk: $(top_builddir)/config.status $(srcdir)/arch-subdir.mk.in diff --git a/sim/configure b/sim/configure index 0fdb11dfe2d..95c1e9db754 100755 --- a/sim/configure +++ b/sim/configure @@ -839,7 +839,6 @@ CC_FOR_TARGET SIM_COMMON_BUILD_FALSE SIM_COMMON_BUILD_TRUE SIM_ENABLED_ARCHES -SIM_SUBDIRS SIM_PRIMARY_TARGET AM_BACKSLASH AM_DEFAULT_VERBOSITY @@ -12449,7 +12448,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12452 "configure" +#line 12451 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12555,7 +12554,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12558 "configure" +#line 12557 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14266,9 +14265,6 @@ fi SIM_PRIMARY_TARGET= -SIM_SUBDIRS= - - SIM_ENABLED_ARCHES= @@ -14277,8 +14273,6 @@ SIM_COMMON_BUILD_FALSE='#' -ac_config_files="$ac_config_files Make-common.sim:common/Make-common.in" - ENABLE_SIM=no @@ -14295,11 +14289,6 @@ if test "${enable_sim}" != no; then fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " aarch64" - ac_config_files="$ac_config_files aarch64/Makefile.sim:aarch64/Makefile.in" - - ac_config_commands="$ac_config_commands aarch64/Makefile" - - as_fn_append SIM_SUBDIRS " aarch64" ac_config_files="$ac_config_files aarch64/.gdbinit:common/gdbinit.in" @@ -14467,11 +14456,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " arm" - ac_config_files="$ac_config_files arm/Makefile.sim:arm/Makefile.in" - - ac_config_commands="$ac_config_commands arm/Makefile" - - as_fn_append SIM_SUBDIRS " arm" ac_config_files="$ac_config_files arm/.gdbinit:common/gdbinit.in" @@ -14512,11 +14496,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " avr" - ac_config_files="$ac_config_files avr/Makefile.sim:avr/Makefile.in" - - ac_config_commands="$ac_config_commands avr/Makefile" - - as_fn_append SIM_SUBDIRS " avr" ac_config_files="$ac_config_files avr/.gdbinit:common/gdbinit.in" @@ -14557,11 +14536,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " bfin" - ac_config_files="$ac_config_files bfin/Makefile.sim:bfin/Makefile.in" - - ac_config_commands="$ac_config_commands bfin/Makefile" - - as_fn_append SIM_SUBDIRS " bfin" ac_config_files="$ac_config_files bfin/.gdbinit:common/gdbinit.in" @@ -14602,11 +14576,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " bpf" - ac_config_files="$ac_config_files bpf/Makefile.sim:bpf/Makefile.in" - - ac_config_commands="$ac_config_commands bpf/Makefile" - - as_fn_append SIM_SUBDIRS " bpf" ac_config_files="$ac_config_files bpf/.gdbinit:common/gdbinit.in" @@ -14647,11 +14616,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " cr16" - ac_config_files="$ac_config_files cr16/Makefile.sim:cr16/Makefile.in" - - ac_config_commands="$ac_config_commands cr16/Makefile" - - as_fn_append SIM_SUBDIRS " cr16" ac_config_files="$ac_config_files cr16/.gdbinit:common/gdbinit.in" @@ -14692,11 +14656,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " cris" - ac_config_files="$ac_config_files cris/Makefile.sim:cris/Makefile.in" - - ac_config_commands="$ac_config_commands cris/Makefile" - - as_fn_append SIM_SUBDIRS " cris" ac_config_files="$ac_config_files cris/.gdbinit:common/gdbinit.in" @@ -14737,11 +14696,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " d10v" - ac_config_files="$ac_config_files d10v/Makefile.sim:d10v/Makefile.in" - - ac_config_commands="$ac_config_commands d10v/Makefile" - - as_fn_append SIM_SUBDIRS " d10v" ac_config_files="$ac_config_files d10v/.gdbinit:common/gdbinit.in" @@ -14782,11 +14736,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " frv" - ac_config_files="$ac_config_files frv/Makefile.sim:frv/Makefile.in" - - ac_config_commands="$ac_config_commands frv/Makefile" - - as_fn_append SIM_SUBDIRS " frv" ac_config_files="$ac_config_files frv/.gdbinit:common/gdbinit.in" @@ -14827,11 +14776,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " ft32" - ac_config_files="$ac_config_files ft32/Makefile.sim:ft32/Makefile.in" - - ac_config_commands="$ac_config_commands ft32/Makefile" - - as_fn_append SIM_SUBDIRS " ft32" ac_config_files="$ac_config_files ft32/.gdbinit:common/gdbinit.in" @@ -14872,11 +14816,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " h8300" - ac_config_files="$ac_config_files h8300/Makefile.sim:h8300/Makefile.in" - - ac_config_commands="$ac_config_commands h8300/Makefile" - - as_fn_append SIM_SUBDIRS " h8300" ac_config_files="$ac_config_files h8300/.gdbinit:common/gdbinit.in" @@ -14917,11 +14856,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " iq2000" - ac_config_files="$ac_config_files iq2000/Makefile.sim:iq2000/Makefile.in" - - ac_config_commands="$ac_config_commands iq2000/Makefile" - - as_fn_append SIM_SUBDIRS " iq2000" ac_config_files="$ac_config_files iq2000/.gdbinit:common/gdbinit.in" @@ -14962,11 +14896,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " lm32" - ac_config_files="$ac_config_files lm32/Makefile.sim:lm32/Makefile.in" - - ac_config_commands="$ac_config_commands lm32/Makefile" - - as_fn_append SIM_SUBDIRS " lm32" ac_config_files="$ac_config_files lm32/.gdbinit:common/gdbinit.in" @@ -15007,11 +14936,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " m32c" - ac_config_files="$ac_config_files m32c/Makefile.sim:m32c/Makefile.in" - - ac_config_commands="$ac_config_commands m32c/Makefile" - - as_fn_append SIM_SUBDIRS " m32c" ac_config_files="$ac_config_files m32c/.gdbinit:common/gdbinit.in" @@ -15052,11 +14976,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " m32r" - ac_config_files="$ac_config_files m32r/Makefile.sim:m32r/Makefile.in" - - ac_config_commands="$ac_config_commands m32r/Makefile" - - as_fn_append SIM_SUBDIRS " m32r" ac_config_files="$ac_config_files m32r/.gdbinit:common/gdbinit.in" @@ -15097,11 +15016,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " m68hc11" - ac_config_files="$ac_config_files m68hc11/Makefile.sim:m68hc11/Makefile.in" - - ac_config_commands="$ac_config_commands m68hc11/Makefile" - - as_fn_append SIM_SUBDIRS " m68hc11" ac_config_files="$ac_config_files m68hc11/.gdbinit:common/gdbinit.in" @@ -15142,11 +15056,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " mcore" - ac_config_files="$ac_config_files mcore/Makefile.sim:mcore/Makefile.in" - - ac_config_commands="$ac_config_commands mcore/Makefile" - - as_fn_append SIM_SUBDIRS " mcore" ac_config_files="$ac_config_files mcore/.gdbinit:common/gdbinit.in" @@ -15187,11 +15096,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " microblaze" - ac_config_files="$ac_config_files microblaze/Makefile.sim:microblaze/Makefile.in" - - ac_config_commands="$ac_config_commands microblaze/Makefile" - - as_fn_append SIM_SUBDIRS " microblaze" ac_config_files="$ac_config_files microblaze/.gdbinit:common/gdbinit.in" @@ -15232,11 +15136,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " mips" - ac_config_files="$ac_config_files mips/Makefile.sim:mips/Makefile.in" - - ac_config_commands="$ac_config_commands mips/Makefile" - - as_fn_append SIM_SUBDIRS " mips" ac_config_files="$ac_config_files mips/.gdbinit:common/gdbinit.in" @@ -15277,11 +15176,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " mn10300" - ac_config_files="$ac_config_files mn10300/Makefile.sim:mn10300/Makefile.in" - - ac_config_commands="$ac_config_commands mn10300/Makefile" - - as_fn_append SIM_SUBDIRS " mn10300" ac_config_files="$ac_config_files mn10300/.gdbinit:common/gdbinit.in" @@ -15322,11 +15216,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " moxie" - ac_config_files="$ac_config_files moxie/Makefile.sim:moxie/Makefile.in" - - ac_config_commands="$ac_config_commands moxie/Makefile" - - as_fn_append SIM_SUBDIRS " moxie" ac_config_files="$ac_config_files moxie/.gdbinit:common/gdbinit.in" @@ -15367,11 +15256,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " msp430" - ac_config_files="$ac_config_files msp430/Makefile.sim:msp430/Makefile.in" - - ac_config_commands="$ac_config_commands msp430/Makefile" - - as_fn_append SIM_SUBDIRS " msp430" ac_config_files="$ac_config_files msp430/.gdbinit:common/gdbinit.in" @@ -15412,11 +15296,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " or1k" - ac_config_files="$ac_config_files or1k/Makefile.sim:or1k/Makefile.in" - - ac_config_commands="$ac_config_commands or1k/Makefile" - - as_fn_append SIM_SUBDIRS " or1k" ac_config_files="$ac_config_files or1k/.gdbinit:common/gdbinit.in" @@ -15501,11 +15380,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " pru" - ac_config_files="$ac_config_files pru/Makefile.sim:pru/Makefile.in" - - ac_config_commands="$ac_config_commands pru/Makefile" - - as_fn_append SIM_SUBDIRS " pru" ac_config_files="$ac_config_files pru/.gdbinit:common/gdbinit.in" @@ -15546,11 +15420,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " riscv" - ac_config_files="$ac_config_files riscv/Makefile.sim:riscv/Makefile.in" - - ac_config_commands="$ac_config_commands riscv/Makefile" - - as_fn_append SIM_SUBDIRS " riscv" ac_config_files="$ac_config_files riscv/.gdbinit:common/gdbinit.in" @@ -15591,11 +15460,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " rl78" - ac_config_files="$ac_config_files rl78/Makefile.sim:rl78/Makefile.in" - - ac_config_commands="$ac_config_commands rl78/Makefile" - - as_fn_append SIM_SUBDIRS " rl78" ac_config_files="$ac_config_files rl78/.gdbinit:common/gdbinit.in" @@ -15636,11 +15500,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " rx" - ac_config_files="$ac_config_files rx/Makefile.sim:rx/Makefile.in" - - ac_config_commands="$ac_config_commands rx/Makefile" - - as_fn_append SIM_SUBDIRS " rx" ac_config_files="$ac_config_files rx/.gdbinit:common/gdbinit.in" @@ -15681,11 +15540,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " sh" - ac_config_files="$ac_config_files sh/Makefile.sim:sh/Makefile.in" - - ac_config_commands="$ac_config_commands sh/Makefile" - - as_fn_append SIM_SUBDIRS " sh" ac_config_files="$ac_config_files sh/.gdbinit:common/gdbinit.in" @@ -15726,11 +15580,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " erc32" - ac_config_files="$ac_config_files erc32/Makefile.sim:erc32/Makefile.in" - - ac_config_commands="$ac_config_commands erc32/Makefile" - - as_fn_append SIM_SUBDIRS " erc32" ac_config_files="$ac_config_files erc32/.gdbinit:common/gdbinit.in" @@ -15771,11 +15620,6 @@ fi fi ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " v850" - ac_config_files="$ac_config_files v850/Makefile.sim:v850/Makefile.in" - - ac_config_commands="$ac_config_commands v850/Makefile" - - as_fn_append SIM_SUBDIRS " v850" ac_config_files="$ac_config_files v850/.gdbinit:common/gdbinit.in" @@ -15823,11 +15667,6 @@ as_fn_append SIM_TOOLCHAIN_VARS " AS_FOR_TARGET_EXAMPLE_SYNACOR LD_FOR_TARGET_EX ENABLE_SIM=yes as_fn_append SIM_ENABLED_ARCHES " example-synacor" - ac_config_files="$ac_config_files example-synacor/Makefile.sim:example-synacor/Makefile.in" - - ac_config_commands="$ac_config_commands example-synacor/Makefile" - - as_fn_append SIM_SUBDIRS " example-synacor" ac_config_files="$ac_config_files example-synacor/.gdbinit:common/gdbinit.in" @@ -17893,131 +17732,68 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "Make-common.sim") CONFIG_FILES="$CONFIG_FILES Make-common.sim:common/Make-common.in" ;; - "aarch64/Makefile.sim") CONFIG_FILES="$CONFIG_FILES aarch64/Makefile.sim:aarch64/Makefile.in" ;; - "aarch64/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS aarch64/Makefile" ;; "aarch64/.gdbinit") CONFIG_FILES="$CONFIG_FILES aarch64/.gdbinit:common/gdbinit.in" ;; "depdir-aarch64") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-aarch64" ;; - "arm/Makefile.sim") CONFIG_FILES="$CONFIG_FILES arm/Makefile.sim:arm/Makefile.in" ;; - "arm/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS arm/Makefile" ;; "arm/.gdbinit") CONFIG_FILES="$CONFIG_FILES arm/.gdbinit:common/gdbinit.in" ;; "depdir-arm") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-arm" ;; - "avr/Makefile.sim") CONFIG_FILES="$CONFIG_FILES avr/Makefile.sim:avr/Makefile.in" ;; - "avr/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS avr/Makefile" ;; "avr/.gdbinit") CONFIG_FILES="$CONFIG_FILES avr/.gdbinit:common/gdbinit.in" ;; "depdir-avr") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-avr" ;; - "bfin/Makefile.sim") CONFIG_FILES="$CONFIG_FILES bfin/Makefile.sim:bfin/Makefile.in" ;; - "bfin/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS bfin/Makefile" ;; "bfin/.gdbinit") CONFIG_FILES="$CONFIG_FILES bfin/.gdbinit:common/gdbinit.in" ;; "depdir-bfin") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-bfin" ;; - "bpf/Makefile.sim") CONFIG_FILES="$CONFIG_FILES bpf/Makefile.sim:bpf/Makefile.in" ;; - "bpf/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS bpf/Makefile" ;; "bpf/.gdbinit") CONFIG_FILES="$CONFIG_FILES bpf/.gdbinit:common/gdbinit.in" ;; "depdir-bpf") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-bpf" ;; - "cr16/Makefile.sim") CONFIG_FILES="$CONFIG_FILES cr16/Makefile.sim:cr16/Makefile.in" ;; - "cr16/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS cr16/Makefile" ;; "cr16/.gdbinit") CONFIG_FILES="$CONFIG_FILES cr16/.gdbinit:common/gdbinit.in" ;; "depdir-cr16") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-cr16" ;; - "cris/Makefile.sim") CONFIG_FILES="$CONFIG_FILES cris/Makefile.sim:cris/Makefile.in" ;; - "cris/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS cris/Makefile" ;; "cris/.gdbinit") CONFIG_FILES="$CONFIG_FILES cris/.gdbinit:common/gdbinit.in" ;; "depdir-cris") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-cris" ;; - "d10v/Makefile.sim") CONFIG_FILES="$CONFIG_FILES d10v/Makefile.sim:d10v/Makefile.in" ;; - "d10v/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS d10v/Makefile" ;; "d10v/.gdbinit") CONFIG_FILES="$CONFIG_FILES d10v/.gdbinit:common/gdbinit.in" ;; "depdir-d10v") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-d10v" ;; - "frv/Makefile.sim") CONFIG_FILES="$CONFIG_FILES frv/Makefile.sim:frv/Makefile.in" ;; - "frv/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS frv/Makefile" ;; "frv/.gdbinit") CONFIG_FILES="$CONFIG_FILES frv/.gdbinit:common/gdbinit.in" ;; "depdir-frv") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-frv" ;; - "ft32/Makefile.sim") CONFIG_FILES="$CONFIG_FILES ft32/Makefile.sim:ft32/Makefile.in" ;; - "ft32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS ft32/Makefile" ;; "ft32/.gdbinit") CONFIG_FILES="$CONFIG_FILES ft32/.gdbinit:common/gdbinit.in" ;; "depdir-ft32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-ft32" ;; - "h8300/Makefile.sim") CONFIG_FILES="$CONFIG_FILES h8300/Makefile.sim:h8300/Makefile.in" ;; - "h8300/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS h8300/Makefile" ;; "h8300/.gdbinit") CONFIG_FILES="$CONFIG_FILES h8300/.gdbinit:common/gdbinit.in" ;; "depdir-h8300") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-h8300" ;; - "iq2000/Makefile.sim") CONFIG_FILES="$CONFIG_FILES iq2000/Makefile.sim:iq2000/Makefile.in" ;; - "iq2000/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS iq2000/Makefile" ;; "iq2000/.gdbinit") CONFIG_FILES="$CONFIG_FILES iq2000/.gdbinit:common/gdbinit.in" ;; "depdir-iq2000") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-iq2000" ;; - "lm32/Makefile.sim") CONFIG_FILES="$CONFIG_FILES lm32/Makefile.sim:lm32/Makefile.in" ;; - "lm32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lm32/Makefile" ;; "lm32/.gdbinit") CONFIG_FILES="$CONFIG_FILES lm32/.gdbinit:common/gdbinit.in" ;; "depdir-lm32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-lm32" ;; - "m32c/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m32c/Makefile.sim:m32c/Makefile.in" ;; - "m32c/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m32c/Makefile" ;; "m32c/.gdbinit") CONFIG_FILES="$CONFIG_FILES m32c/.gdbinit:common/gdbinit.in" ;; "depdir-m32c") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-m32c" ;; - "m32r/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m32r/Makefile.sim:m32r/Makefile.in" ;; - "m32r/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m32r/Makefile" ;; "m32r/.gdbinit") CONFIG_FILES="$CONFIG_FILES m32r/.gdbinit:common/gdbinit.in" ;; "depdir-m32r") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-m32r" ;; - "m68hc11/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m68hc11/Makefile.sim:m68hc11/Makefile.in" ;; - "m68hc11/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m68hc11/Makefile" ;; "m68hc11/.gdbinit") CONFIG_FILES="$CONFIG_FILES m68hc11/.gdbinit:common/gdbinit.in" ;; "depdir-m68hc11") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-m68hc11" ;; - "mcore/Makefile.sim") CONFIG_FILES="$CONFIG_FILES mcore/Makefile.sim:mcore/Makefile.in" ;; - "mcore/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS mcore/Makefile" ;; "mcore/.gdbinit") CONFIG_FILES="$CONFIG_FILES mcore/.gdbinit:common/gdbinit.in" ;; "depdir-mcore") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-mcore" ;; - "microblaze/Makefile.sim") CONFIG_FILES="$CONFIG_FILES microblaze/Makefile.sim:microblaze/Makefile.in" ;; - "microblaze/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS microblaze/Makefile" ;; "microblaze/.gdbinit") CONFIG_FILES="$CONFIG_FILES microblaze/.gdbinit:common/gdbinit.in" ;; "depdir-microblaze") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-microblaze" ;; - "mips/Makefile.sim") CONFIG_FILES="$CONFIG_FILES mips/Makefile.sim:mips/Makefile.in" ;; - "mips/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS mips/Makefile" ;; "mips/.gdbinit") CONFIG_FILES="$CONFIG_FILES mips/.gdbinit:common/gdbinit.in" ;; "depdir-mips") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-mips" ;; - "mn10300/Makefile.sim") CONFIG_FILES="$CONFIG_FILES mn10300/Makefile.sim:mn10300/Makefile.in" ;; - "mn10300/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS mn10300/Makefile" ;; "mn10300/.gdbinit") CONFIG_FILES="$CONFIG_FILES mn10300/.gdbinit:common/gdbinit.in" ;; "depdir-mn10300") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-mn10300" ;; - "moxie/Makefile.sim") CONFIG_FILES="$CONFIG_FILES moxie/Makefile.sim:moxie/Makefile.in" ;; - "moxie/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS moxie/Makefile" ;; "moxie/.gdbinit") CONFIG_FILES="$CONFIG_FILES moxie/.gdbinit:common/gdbinit.in" ;; "depdir-moxie") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-moxie" ;; - "msp430/Makefile.sim") CONFIG_FILES="$CONFIG_FILES msp430/Makefile.sim:msp430/Makefile.in" ;; - "msp430/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS msp430/Makefile" ;; "msp430/.gdbinit") CONFIG_FILES="$CONFIG_FILES msp430/.gdbinit:common/gdbinit.in" ;; "depdir-msp430") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-msp430" ;; - "or1k/Makefile.sim") CONFIG_FILES="$CONFIG_FILES or1k/Makefile.sim:or1k/Makefile.in" ;; - "or1k/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS or1k/Makefile" ;; "or1k/.gdbinit") CONFIG_FILES="$CONFIG_FILES or1k/.gdbinit:common/gdbinit.in" ;; "depdir-or1k") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-or1k" ;; "ppc/.gdbinit") CONFIG_FILES="$CONFIG_FILES ppc/.gdbinit:common/gdbinit.in" ;; "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" ;; "pru/.gdbinit") CONFIG_FILES="$CONFIG_FILES pru/.gdbinit:common/gdbinit.in" ;; "depdir-pru") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-pru" ;; - "riscv/Makefile.sim") CONFIG_FILES="$CONFIG_FILES riscv/Makefile.sim:riscv/Makefile.in" ;; - "riscv/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS riscv/Makefile" ;; "riscv/.gdbinit") CONFIG_FILES="$CONFIG_FILES riscv/.gdbinit:common/gdbinit.in" ;; "depdir-riscv") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-riscv" ;; - "rl78/Makefile.sim") CONFIG_FILES="$CONFIG_FILES rl78/Makefile.sim:rl78/Makefile.in" ;; - "rl78/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS rl78/Makefile" ;; "rl78/.gdbinit") CONFIG_FILES="$CONFIG_FILES rl78/.gdbinit:common/gdbinit.in" ;; "depdir-rl78") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-rl78" ;; - "rx/Makefile.sim") CONFIG_FILES="$CONFIG_FILES rx/Makefile.sim:rx/Makefile.in" ;; - "rx/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS rx/Makefile" ;; "rx/.gdbinit") CONFIG_FILES="$CONFIG_FILES rx/.gdbinit:common/gdbinit.in" ;; "depdir-rx") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-rx" ;; - "sh/Makefile.sim") CONFIG_FILES="$CONFIG_FILES sh/Makefile.sim:sh/Makefile.in" ;; - "sh/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS sh/Makefile" ;; "sh/.gdbinit") CONFIG_FILES="$CONFIG_FILES sh/.gdbinit:common/gdbinit.in" ;; "depdir-sh") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-sh" ;; - "erc32/Makefile.sim") CONFIG_FILES="$CONFIG_FILES erc32/Makefile.sim:erc32/Makefile.in" ;; - "erc32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS erc32/Makefile" ;; "erc32/.gdbinit") CONFIG_FILES="$CONFIG_FILES erc32/.gdbinit:common/gdbinit.in" ;; "depdir-erc32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-erc32" ;; - "v850/Makefile.sim") CONFIG_FILES="$CONFIG_FILES v850/Makefile.sim:v850/Makefile.in" ;; - "v850/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS v850/Makefile" ;; "v850/.gdbinit") CONFIG_FILES="$CONFIG_FILES v850/.gdbinit:common/gdbinit.in" ;; "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" ;; "example-synacor/.gdbinit") CONFIG_FILES="$CONFIG_FILES example-synacor/.gdbinit:common/gdbinit.in" ;; "depdir-example-synacor") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-example-synacor" ;; "arch-subdir.mk") CONFIG_FILES="$CONFIG_FILES arch-subdir.mk" ;; @@ -19349,410 +19125,38 @@ $as_echo X"$file" | done done } - ;; - "aarch64/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/aarch64: - p - }' \ - aarch64/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' aarch64/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r aarch64/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r aarch64/Makesim2.tmp' \ - aarch64/Makefile - rm -f aarch64/Makesim1.tmp aarch64/Makesim2.tmp ;; "depdir-aarch64":C) $SHELL $ac_aux_dir/mkinstalldirs aarch64/$DEPDIR ;; - "arm/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/arm: - p - }' \ - arm/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' arm/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r arm/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r arm/Makesim2.tmp' \ - arm/Makefile - rm -f arm/Makesim1.tmp arm/Makesim2.tmp - ;; "depdir-arm":C) $SHELL $ac_aux_dir/mkinstalldirs arm/$DEPDIR ;; - "avr/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/avr: - p - }' \ - avr/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' avr/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r avr/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r avr/Makesim2.tmp' \ - avr/Makefile - rm -f avr/Makesim1.tmp avr/Makesim2.tmp - ;; "depdir-avr":C) $SHELL $ac_aux_dir/mkinstalldirs avr/$DEPDIR ;; - "bfin/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/bfin: - p - }' \ - bfin/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' bfin/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r bfin/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r bfin/Makesim2.tmp' \ - bfin/Makefile - rm -f bfin/Makesim1.tmp bfin/Makesim2.tmp - ;; "depdir-bfin":C) $SHELL $ac_aux_dir/mkinstalldirs bfin/$DEPDIR ;; - "bpf/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/bpf: - p - }' \ - bpf/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' bpf/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r bpf/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r bpf/Makesim2.tmp' \ - bpf/Makefile - rm -f bpf/Makesim1.tmp bpf/Makesim2.tmp - ;; "depdir-bpf":C) $SHELL $ac_aux_dir/mkinstalldirs bpf/$DEPDIR ;; - "cr16/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/cr16: - p - }' \ - cr16/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' cr16/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r cr16/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r cr16/Makesim2.tmp' \ - cr16/Makefile - rm -f cr16/Makesim1.tmp cr16/Makesim2.tmp - ;; "depdir-cr16":C) $SHELL $ac_aux_dir/mkinstalldirs cr16/$DEPDIR ;; - "cris/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/cris: - p - }' \ - cris/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' cris/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r cris/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r cris/Makesim2.tmp' \ - cris/Makefile - rm -f cris/Makesim1.tmp cris/Makesim2.tmp - ;; "depdir-cris":C) $SHELL $ac_aux_dir/mkinstalldirs cris/$DEPDIR ;; - "d10v/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/d10v: - p - }' \ - d10v/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' d10v/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r d10v/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r d10v/Makesim2.tmp' \ - d10v/Makefile - rm -f d10v/Makesim1.tmp d10v/Makesim2.tmp - ;; "depdir-d10v":C) $SHELL $ac_aux_dir/mkinstalldirs d10v/$DEPDIR ;; - "frv/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/frv: - p - }' \ - frv/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' frv/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r frv/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r frv/Makesim2.tmp' \ - frv/Makefile - rm -f frv/Makesim1.tmp frv/Makesim2.tmp - ;; "depdir-frv":C) $SHELL $ac_aux_dir/mkinstalldirs frv/$DEPDIR ;; - "ft32/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/ft32: - p - }' \ - ft32/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' ft32/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r ft32/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r ft32/Makesim2.tmp' \ - ft32/Makefile - rm -f ft32/Makesim1.tmp ft32/Makesim2.tmp - ;; "depdir-ft32":C) $SHELL $ac_aux_dir/mkinstalldirs ft32/$DEPDIR ;; - "h8300/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/h8300: - p - }' \ - h8300/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' h8300/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r h8300/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r h8300/Makesim2.tmp' \ - h8300/Makefile - rm -f h8300/Makesim1.tmp h8300/Makesim2.tmp - ;; "depdir-h8300":C) $SHELL $ac_aux_dir/mkinstalldirs h8300/$DEPDIR ;; - "iq2000/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/iq2000: - p - }' \ - iq2000/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' iq2000/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r iq2000/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r iq2000/Makesim2.tmp' \ - iq2000/Makefile - rm -f iq2000/Makesim1.tmp iq2000/Makesim2.tmp - ;; "depdir-iq2000":C) $SHELL $ac_aux_dir/mkinstalldirs iq2000/$DEPDIR ;; - "lm32/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/lm32: - p - }' \ - lm32/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' lm32/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r lm32/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r lm32/Makesim2.tmp' \ - lm32/Makefile - rm -f lm32/Makesim1.tmp lm32/Makesim2.tmp - ;; "depdir-lm32":C) $SHELL $ac_aux_dir/mkinstalldirs lm32/$DEPDIR ;; - "m32c/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/m32c: - p - }' \ - m32c/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' m32c/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r m32c/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r m32c/Makesim2.tmp' \ - m32c/Makefile - rm -f m32c/Makesim1.tmp m32c/Makesim2.tmp - ;; "depdir-m32c":C) $SHELL $ac_aux_dir/mkinstalldirs m32c/$DEPDIR ;; - "m32r/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/m32r: - p - }' \ - m32r/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' m32r/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r m32r/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r m32r/Makesim2.tmp' \ - m32r/Makefile - rm -f m32r/Makesim1.tmp m32r/Makesim2.tmp - ;; "depdir-m32r":C) $SHELL $ac_aux_dir/mkinstalldirs m32r/$DEPDIR ;; - "m68hc11/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/m68hc11: - p - }' \ - m68hc11/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' m68hc11/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r m68hc11/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r m68hc11/Makesim2.tmp' \ - m68hc11/Makefile - rm -f m68hc11/Makesim1.tmp m68hc11/Makesim2.tmp - ;; "depdir-m68hc11":C) $SHELL $ac_aux_dir/mkinstalldirs m68hc11/$DEPDIR ;; - "mcore/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/mcore: - p - }' \ - mcore/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' mcore/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r mcore/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r mcore/Makesim2.tmp' \ - mcore/Makefile - rm -f mcore/Makesim1.tmp mcore/Makesim2.tmp - ;; "depdir-mcore":C) $SHELL $ac_aux_dir/mkinstalldirs mcore/$DEPDIR ;; - "microblaze/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/microblaze: - p - }' \ - microblaze/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' microblaze/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r microblaze/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r microblaze/Makesim2.tmp' \ - microblaze/Makefile - rm -f microblaze/Makesim1.tmp microblaze/Makesim2.tmp - ;; "depdir-microblaze":C) $SHELL $ac_aux_dir/mkinstalldirs microblaze/$DEPDIR ;; - "mips/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/mips: - p - }' \ - mips/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' mips/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r mips/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r mips/Makesim2.tmp' \ - mips/Makefile - rm -f mips/Makesim1.tmp mips/Makesim2.tmp - ;; "depdir-mips":C) $SHELL $ac_aux_dir/mkinstalldirs mips/$DEPDIR ;; - "mn10300/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/mn10300: - p - }' \ - mn10300/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' mn10300/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r mn10300/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r mn10300/Makesim2.tmp' \ - mn10300/Makefile - rm -f mn10300/Makesim1.tmp mn10300/Makesim2.tmp - ;; "depdir-mn10300":C) $SHELL $ac_aux_dir/mkinstalldirs mn10300/$DEPDIR ;; - "moxie/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/moxie: - p - }' \ - moxie/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' moxie/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r moxie/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r moxie/Makesim2.tmp' \ - moxie/Makefile - rm -f moxie/Makesim1.tmp moxie/Makesim2.tmp - ;; "depdir-moxie":C) $SHELL $ac_aux_dir/mkinstalldirs moxie/$DEPDIR ;; - "msp430/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/msp430: - p - }' \ - msp430/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' msp430/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r msp430/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r msp430/Makesim2.tmp' \ - msp430/Makefile - rm -f msp430/Makesim1.tmp msp430/Makesim2.tmp - ;; "depdir-msp430":C) $SHELL $ac_aux_dir/mkinstalldirs msp430/$DEPDIR ;; - "or1k/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/or1k: - p - }' \ - or1k/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' or1k/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r or1k/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r or1k/Makesim2.tmp' \ - or1k/Makefile - rm -f or1k/Makesim1.tmp or1k/Makesim2.tmp - ;; "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: - p - }' \ - pru/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' pru/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r pru/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r pru/Makesim2.tmp' \ - pru/Makefile - rm -f pru/Makesim1.tmp pru/Makesim2.tmp - ;; "depdir-pru":C) $SHELL $ac_aux_dir/mkinstalldirs pru/$DEPDIR ;; - "riscv/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/riscv: - p - }' \ - riscv/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' riscv/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r riscv/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r riscv/Makesim2.tmp' \ - riscv/Makefile - rm -f riscv/Makesim1.tmp riscv/Makesim2.tmp - ;; "depdir-riscv":C) $SHELL $ac_aux_dir/mkinstalldirs riscv/$DEPDIR ;; - "rl78/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/rl78: - p - }' \ - rl78/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' rl78/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r rl78/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r rl78/Makesim2.tmp' \ - rl78/Makefile - rm -f rl78/Makesim1.tmp rl78/Makesim2.tmp - ;; "depdir-rl78":C) $SHELL $ac_aux_dir/mkinstalldirs rl78/$DEPDIR ;; - "rx/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/rx: - p - }' \ - rx/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' rx/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r rx/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r rx/Makesim2.tmp' \ - rx/Makefile - rm -f rx/Makesim1.tmp rx/Makesim2.tmp - ;; "depdir-rx":C) $SHELL $ac_aux_dir/mkinstalldirs rx/$DEPDIR ;; - "sh/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/sh: - p - }' \ - sh/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' sh/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r sh/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r sh/Makesim2.tmp' \ - sh/Makefile - rm -f sh/Makesim1.tmp sh/Makesim2.tmp - ;; "depdir-sh":C) $SHELL $ac_aux_dir/mkinstalldirs sh/$DEPDIR ;; - "erc32/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/erc32: - p - }' \ - erc32/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' erc32/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r erc32/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r erc32/Makesim2.tmp' \ - erc32/Makefile - rm -f erc32/Makesim1.tmp erc32/Makesim2.tmp - ;; "depdir-erc32":C) $SHELL $ac_aux_dir/mkinstalldirs erc32/$DEPDIR ;; - "v850/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/v850: - p - }' \ - v850/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' v850/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r v850/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r v850/Makesim2.tmp' \ - v850/Makefile - rm -f v850/Makesim1.tmp v850/Makesim2.tmp - ;; "depdir-v850":C) $SHELL $ac_aux_dir/mkinstalldirs v850/$DEPDIR ;; - "example-synacor/Makefile":C) sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/example-synacor: - p - }' \ - example-synacor/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' example-synacor/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r example-synacor/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r example-synacor/Makesim2.tmp' \ - example-synacor/Makefile - rm -f example-synacor/Makesim1.tmp example-synacor/Makesim2.tmp - ;; "depdir-example-synacor":C) $SHELL $ac_aux_dir/mkinstalldirs example-synacor/$DEPDIR ;; esac diff --git a/sim/configure.ac b/sim/configure.ac index 714754ea9f3..8f93aa77f41 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -48,10 +48,6 @@ dnl used when installing files to see if they need to be suffixed. SIM_PRIMARY_TARGET= AC_SUBST(SIM_PRIMARY_TARGET) -dnl Directories that we need to recurse into (i.e. add to $SUBDIRS). -SIM_SUBDIRS= -AC_SUBST(SIM_SUBDIRS) - dnl List of enabled arch backends. SIM_ENABLED_ARCHES= AC_SUBST(SIM_ENABLED_ARCHES) @@ -62,7 +58,6 @@ SIM_COMMON_BUILD_FALSE='#' AC_SUBST(SIM_COMMON_BUILD_TRUE) AC_SUBST(SIM_COMMON_BUILD_FALSE) -AC_CONFIG_FILES(Make-common.sim:common/Make-common.in) ENABLE_SIM=no dnl Build a particular arch subdir. dnl arg[1] is the arch subdir name. @@ -72,22 +67,6 @@ m4_define([SIM_BUILD_TARGET], [dnl AS_VAR_APPEND([SIM_ENABLED_ARCHES], [" $1"]) m4_if($2, [true], [dnl AC_CONFIG_SUBDIRS($1) - ], [dnl - AC_CONFIG_FILES($1/Makefile.sim:$1/Makefile.in) - AC_CONFIG_COMMANDS([$1/Makefile], -[sed -n \ - -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ { - /^srcdir = / s:$:/$1: - p - }' \ - $1/Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' $1/Makesim2.tmp - sed -e '/^## COMMON_PRE_/ r $1/Makesim1.tmp' \ - -e '/^## COMMON_POST_/ r $1/Makesim2.tmp' \ - <$1/Makefile.sim >$1/Makefile - rm -f $1/Makesim1.tmp $1/Makesim2.tmp -]) - AS_VAR_APPEND([SIM_SUBDIRS], [" $1"]) ]) AC_CONFIG_FILES($1/.gdbinit:common/gdbinit.in) dnl Create the depdirs for ports until we can convert them to automake. -- 2.30.2