From 80636a54bcfa2bca3dc8f7de4a7825f86585b1f1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 2 Jan 2023 21:16:19 -0500 Subject: [PATCH] sim: build: move generated headers to built sources Automake's automatic header deptracking has a bootstrap problem where it can't detect generated headers when compiling. We've been handling that by adding a custom SIM_ALL_RECURSIVE_DEPS variable, but that only works when building objects recursively in subdirs. As we move those out to the top-level, we don't have any recursive steps anymore. The Automake approach is to declare those headers in BUILT_SOURCES. This isn't completely foolproof as the Automake manual documents: it only activates for `make all`, not `make foo.o`, but that shouldn't be a huge limitation as it only affects the initial compile. After that, rebuilds should work fine. --- sim/Makefile.am | 1 + sim/Makefile.in | 253 ++++++++++++++++++++++++------------------- sim/bpf/local.mk | 6 +- sim/cr16/local.mk | 3 +- sim/cris/local.mk | 6 +- sim/d10v/local.mk | 3 +- sim/frv/local.mk | 3 +- sim/iq2000/local.mk | 3 +- sim/lm32/local.mk | 3 +- sim/m32r/local.mk | 8 +- sim/mips/local.mk | 2 + sim/mn10300/local.mk | 9 ++ sim/or1k/local.mk | 3 +- sim/v850/local.mk | 9 ++ 14 files changed, 189 insertions(+), 123 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index eb891a56f2d..dd85297c83e 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -36,6 +36,7 @@ check_PROGRAMS = noinst_PROGRAMS = noinst_LIBRARIES = EXTRA_PROGRAMS = +BUILT_SOURCES = CLEANFILES = DISTCLEANFILES = diff --git a/sim/Makefile.in b/sim/Makefile.in index 4f76590ee7b..adcd3c6dd6a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -147,97 +147,135 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_bfin_TRUE@am__append_11 = bfin/run @SIM_ENABLE_ARCH_bfin_TRUE@am__append_12 = bfin_SIM_EXTRA_HW_DEVICES="$(bfin_SIM_EXTRA_HW_DEVICES)" @SIM_ENABLE_ARCH_bpf_TRUE@am__append_13 = bpf/run -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_14 = $(bpf_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_bpf_TRUE@am__append_14 = \ +@SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-le.h \ +@SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-be.h + @SIM_ENABLE_ARCH_bpf_TRUE@am__append_15 = $(bpf_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_16 = cr16/run -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_17 = $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_18 = cr16/gencode +@SIM_ENABLE_ARCH_bpf_TRUE@am__append_16 = $(bpf_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_17 = cr16/run +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_18 = cr16/simops.h @SIM_ENABLE_ARCH_cr16_TRUE@am__append_19 = $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cris_TRUE@am__append_20 = cris/run -@SIM_ENABLE_ARCH_cris_TRUE@am__append_21 = cris_SIM_EXTRA_HW_DEVICES="$(cris_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_cris_TRUE@am__append_22 = cris/rvdummy -@SIM_ENABLE_ARCH_cris_TRUE@am__append_23 = $(cris_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cris_TRUE@am__append_24 = $(cris_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_25 = d10v/run -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_26 = $(d10v_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_27 = d10v/gencode -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_28 = $(d10v_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_29 = erc32/run erc32/sis -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_30 = sim-%D-install-exec-local -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_31 = sim-erc32-uninstall-local -@SIM_ENABLE_ARCH_examples_TRUE@am__append_32 = example-synacor/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_33 = frv/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_34 = $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_frv_TRUE@am__append_35 = $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ft32_TRUE@am__append_36 = ft32/run -@SIM_ENABLE_ARCH_h8300_TRUE@am__append_37 = h8300/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_38 = iq2000/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_39 = $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_40 = $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_41 = lm32/run -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_42 = lm32_SIM_EXTRA_HW_DEVICES="$(lm32_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_43 = $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_44 = $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_45 = m32c/run -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_46 = $(m32c_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_47 = m32c/opc2c -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_48 = \ +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_20 = cr16/gencode +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_21 = $(cr16_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cris_TRUE@am__append_22 = cris/run +@SIM_ENABLE_ARCH_cris_TRUE@am__append_23 = cris_SIM_EXTRA_HW_DEVICES="$(cris_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_cris_TRUE@am__append_24 = cris/rvdummy +@SIM_ENABLE_ARCH_cris_TRUE@am__append_25 = \ +@SIM_ENABLE_ARCH_cris_TRUE@ cris/engv10.h \ +@SIM_ENABLE_ARCH_cris_TRUE@ cris/engv32.h + +@SIM_ENABLE_ARCH_cris_TRUE@am__append_26 = $(cris_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cris_TRUE@am__append_27 = $(cris_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_28 = d10v/run +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_29 = d10v/simops.h +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_30 = $(d10v_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_31 = d10v/gencode +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_32 = $(d10v_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_33 = erc32/run erc32/sis +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_34 = sim-%D-install-exec-local +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_35 = sim-erc32-uninstall-local +@SIM_ENABLE_ARCH_examples_TRUE@am__append_36 = example-synacor/run +@SIM_ENABLE_ARCH_frv_TRUE@am__append_37 = frv/run +@SIM_ENABLE_ARCH_frv_TRUE@am__append_38 = frv/eng.h +@SIM_ENABLE_ARCH_frv_TRUE@am__append_39 = $(frv_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_frv_TRUE@am__append_40 = $(frv_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ft32_TRUE@am__append_41 = ft32/run +@SIM_ENABLE_ARCH_h8300_TRUE@am__append_42 = h8300/run +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_43 = iq2000/run +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_44 = iq2000/eng.h +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_45 = $(iq2000_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_46 = $(iq2000_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_47 = lm32/run +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_48 = lm32_SIM_EXTRA_HW_DEVICES="$(lm32_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_49 = lm32/eng.h +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_50 = $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_51 = $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_52 = m32c/run +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_53 = $(m32c_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_54 = m32c/opc2c +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_55 = \ @SIM_ENABLE_ARCH_m32c_TRUE@ $(m32c_BUILD_OUTPUTS) \ @SIM_ENABLE_ARCH_m32c_TRUE@ m32c/m32c.c.log \ @SIM_ENABLE_ARCH_m32c_TRUE@ m32c/r8c.c.log -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_49 = m32r/run -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_50 = m32r_SIM_EXTRA_HW_DEVICES="$(m32r_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_51 = $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_52 = $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_53 = m68hc11/run -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_54 = m68hc11_SIM_EXTRA_HW_DEVICES="$(m68hc11_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_55 = $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_56 = m68hc11/gencode -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_57 = $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mcore_TRUE@am__append_58 = mcore/run -@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_59 = microblaze/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_60 = mips/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_61 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_62 = \ +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_56 = m32r/run +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_57 = m32r_SIM_EXTRA_HW_DEVICES="$(m32r_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_58 = \ +@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng.h \ +@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/engx.h \ +@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng2.h + +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_59 = $(m32r_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_60 = $(m32r_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_61 = m68hc11/run +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_62 = m68hc11_SIM_EXTRA_HW_DEVICES="$(m68hc11_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_63 = $(m68hc11_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_64 = m68hc11/gencode +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_65 = $(m68hc11_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mcore_TRUE@am__append_66 = mcore/run +@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_67 = microblaze/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_68 = mips/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_69 = mips_SIM_EXTRA_HW_DEVICES="$(mips_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mips_TRUE@am__append_70 = mips/itable.h +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_71 = \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ $(mips_BUILT_SRC_FROM_GEN_MODE_SINGLE) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ mips/stamp-gen-mode-single -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_63 = \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_72 = \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_FROM_GEN_MODE_M16_M16) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_FROM_GEN_MODE_M16_M32) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mode-m16-m16 \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mode-m16-m32 -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_64 = \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_73 = \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@ $(SIM_MIPS_MULTI_SRC) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@ mips/stamp-gen-mode-multi-igen \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@ mips/stamp-gen-mode-multi-run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_65 = $(mips_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mips_TRUE@am__append_66 = $(mips_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mips_TRUE@am__append_67 = mips/multi-include.h mips/multi-run.c -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_68 = mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_69 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_70 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_71 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_72 = moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_73 = msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_74 = or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_75 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_76 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_77 = ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_78 = pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_79 = riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_80 = rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_81 = rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_82 = sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_83 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_84 = sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_85 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_86 = v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_87 = $(v850_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_88 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_74 = $(mips_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_75 = $(mips_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_76 = mips/multi-include.h mips/multi-run.c +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_77 = mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_78 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_79 = \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/icache.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/idecode.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/semantics.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/model.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/support.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/itable.h \ +@SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/engine.h + +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_80 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_81 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_82 = moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_83 = msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_84 = or1k/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_85 = or1k/eng.h +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_86 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_87 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_88 = ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_89 = pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_90 = riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_91 = rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_92 = rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_93 = sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_94 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_95 = sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_96 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_97 = v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_98 = \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/icache.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/idecode.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/semantics.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/model.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/support.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/itable.h \ +@SIM_ENABLE_ARCH_v850_TRUE@ v850/engine.h + +@SIM_ENABLE_ARCH_v850_TRUE@am__append_99 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_100 = $(v850_BUILD_OUTPUTS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -1213,24 +1251,28 @@ srccom = $(srcdir)/common srcroot = $(srcdir)/.. SUBDIRS = @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \ - $(am__append_3) $(am__append_12) $(am__append_21) \ - $(am__append_42) $(am__append_50) $(am__append_54) \ - $(am__append_61) $(am__append_69) + $(am__append_3) $(am__append_12) $(am__append_23) \ + $(am__append_48) $(am__append_57) $(am__append_62) \ + $(am__append_69) $(am__append_78) pkginclude_HEADERS = $(am__append_1) noinst_LIBRARIES = $(SIM_COMMON_LIB) $(am__append_5) +BUILT_SOURCES = $(am__append_14) $(am__append_18) $(am__append_25) \ + $(am__append_29) $(am__append_38) $(am__append_44) \ + $(am__append_49) $(am__append_58) $(am__append_70) \ + $(am__append_79) $(am__append_85) $(am__append_98) CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ testsuite/common/bits64m63.c -DISTCLEANFILES = $(am__append_67) +DISTCLEANFILES = $(am__append_76) MOSTLYCLEANFILES = core $(common_HW_CONFIG_H_TARGETS) $(patsubst \ %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) $(am__append_7) \ - site-sim-config.exp testrun.log testrun.sum $(am__append_15) \ - $(am__append_19) $(am__append_24) $(am__append_28) \ - $(am__append_35) $(am__append_40) $(am__append_44) \ - $(am__append_48) $(am__append_52) $(am__append_57) \ - $(am__append_66) $(am__append_71) $(am__append_76) \ - $(am__append_85) $(am__append_88) + site-sim-config.exp testrun.log testrun.sum $(am__append_16) \ + $(am__append_21) $(am__append_27) $(am__append_32) \ + $(am__append_40) $(am__append_46) $(am__append_51) \ + $(am__append_55) $(am__append_60) $(am__append_65) \ + $(am__append_75) $(am__append_81) $(am__append_87) \ + $(am__append_96) $(am__append_100) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1240,15 +1282,15 @@ AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \ - $(common_HW_CONFIG_H_TARGETS) $(am__append_4) $(am__append_14) \ - $(am__append_17) $(am__append_23) $(am__append_26) \ - $(am__append_34) $(am__append_39) $(am__append_43) \ - $(am__append_46) $(am__append_51) $(am__append_55) \ - $(am__append_65) $(am__append_70) $(am__append_75) \ - $(am__append_83) $(am__append_87) + $(common_HW_CONFIG_H_TARGETS) $(am__append_4) $(am__append_15) \ + $(am__append_19) $(am__append_26) $(am__append_30) \ + $(am__append_39) $(am__append_45) $(am__append_50) \ + $(am__append_53) $(am__append_59) $(am__append_63) \ + $(am__append_74) $(am__append_80) $(am__append_86) \ + $(am__append_94) $(am__append_99) SIM_INSTALL_DATA_LOCAL_DEPS = -SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_30) -SIM_UNINSTALL_LOCAL_DEPS = $(am__append_31) +SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_34) +SIM_UNINSTALL_LOCAL_DEPS = $(am__append_35) SIM_COMMON_LIB = common/libcommon.a common_libcommon_a_SOURCES = \ common/callback.c \ @@ -1476,10 +1518,8 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_bpf_TRUE@ $(SIM_COMMON_LIBS) @SIM_ENABLE_ARCH_bpf_TRUE@bpf_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-le.h \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/mloop-le.c \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/stamp-mloop-le \ -@SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-be.h \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/mloop-be.c \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/stamp-mloop-be @@ -1491,7 +1531,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_cr16_TRUE@cr16_BUILD_OUTPUTS = \ @SIM_ENABLE_ARCH_cr16_TRUE@ cr16/gencode$(EXEEXT) \ -@SIM_ENABLE_ARCH_cr16_TRUE@ cr16/simops.h \ @SIM_ENABLE_ARCH_cr16_TRUE@ cr16/table.c @SIM_ENABLE_ARCH_cr16_TRUE@cr16_gencode_SOURCES = cr16/gencode.c @@ -1506,10 +1545,8 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_cris_TRUE@cris_rvdummy_SOURCES = cris/rvdummy.c @SIM_ENABLE_ARCH_cris_TRUE@cris_rvdummy_LDADD = $(LIBIBERTY_LIB) @SIM_ENABLE_ARCH_cris_TRUE@cris_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_cris_TRUE@ cris/engv10.h \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/mloopv10f.c \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/stamp-mloop-v10f \ -@SIM_ENABLE_ARCH_cris_TRUE@ cris/engv32.h \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/mloopv32f.c \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/stamp-mloop-v32f @@ -1521,7 +1558,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_d10v_TRUE@d10v_BUILD_OUTPUTS = \ @SIM_ENABLE_ARCH_d10v_TRUE@ d10v/gencode$(EXEEXT) \ -@SIM_ENABLE_ARCH_d10v_TRUE@ d10v/simops.h \ @SIM_ENABLE_ARCH_d10v_TRUE@ d10v/table.c @SIM_ENABLE_ARCH_d10v_TRUE@d10v_gencode_SOURCES = d10v/gencode.c @@ -1549,7 +1585,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_frv_TRUE@frvdocdir = $(docdir)/frv @SIM_ENABLE_ARCH_frv_TRUE@frvdoc_DATA = frv/README @SIM_ENABLE_ARCH_frv_TRUE@frv_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_frv_TRUE@ frv/eng.h \ @SIM_ENABLE_ARCH_frv_TRUE@ frv/mloop.c \ @SIM_ENABLE_ARCH_frv_TRUE@ frv/stamp-mloop @@ -1572,7 +1607,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_iq2000_TRUE@ $(SIM_COMMON_LIBS) @SIM_ENABLE_ARCH_iq2000_TRUE@iq2000_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_iq2000_TRUE@ iq2000/eng.h \ @SIM_ENABLE_ARCH_iq2000_TRUE@ iq2000/mloop.c \ @SIM_ENABLE_ARCH_iq2000_TRUE@ iq2000/stamp-mloop @@ -1584,7 +1618,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_lm32_TRUE@lm32_SIM_EXTRA_HW_DEVICES = lm32cpu lm32timer lm32uart @SIM_ENABLE_ARCH_lm32_TRUE@lm32_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_lm32_TRUE@ lm32/eng.h \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/mloop.c \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/stamp-mloop @@ -1612,13 +1645,10 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_m32r_TRUE@m32r_SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart @SIM_ENABLE_ARCH_m32r_TRUE@m32r_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng.h \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/mloop.c \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/stamp-mloop \ -@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/engx.h \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/mloopx.c \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/stamp-mloop-x \ -@SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng2.h \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/mloop2.c \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/stamp-mloop-2 @@ -1699,8 +1729,8 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_mips_TRUE@mips_BUILD_OUTPUTS = \ @SIM_ENABLE_ARCH_mips_TRUE@ $(mips_BUILT_SRC_FROM_IGEN_ITABLE) \ @SIM_ENABLE_ARCH_mips_TRUE@ mips/stamp-igen-itable \ -@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_62) $(am__append_63) \ -@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_64) +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_71) $(am__append_72) \ +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_73) @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_TRACE = # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-all @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN = $(srcdir)/mips/mips.igen @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN_INC = \ @@ -1777,7 +1807,6 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_or1k_TRUE@or1kdocdir = $(docdir)/or1k @SIM_ENABLE_ARCH_or1k_TRUE@or1kdoc_DATA = or1k/README @SIM_ENABLE_ARCH_or1k_TRUE@or1k_BUILD_OUTPUTS = \ -@SIM_ENABLE_ARCH_or1k_TRUE@ or1k/eng.h \ @SIM_ENABLE_ARCH_or1k_TRUE@ or1k/mloop.c \ @SIM_ENABLE_ARCH_or1k_TRUE@ or1k/stamp-mloop @@ -1858,7 +1887,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_v850_TRUE@v850_IGEN_TRACE = # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries @SIM_ENABLE_ARCH_v850_TRUE@v850_IGEN_INSN = $(srcdir)/v850/v850.igen @SIM_ENABLE_ARCH_v850_TRUE@v850_IGEN_DC = $(srcdir)/v850/v850.dc -all: config.h +all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -3108,14 +3137,16 @@ testsuite/common/alu-tst.log: testsuite/common/alu-tst$(EXEEXT) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-TESTS -check: check-recursive +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(armdocdir)" "$(DESTDIR)$(dtbdir)" "$(DESTDIR)$(erc32docdir)" "$(DESTDIR)$(frvdocdir)" "$(DESTDIR)$(or1kdocdir)" "$(DESTDIR)$(ppcdocdir)" "$(DESTDIR)$(rxdocdir)" "$(DESTDIR)$(pkgincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-recursive +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -3197,6 +3228,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ @@ -3277,7 +3309,8 @@ uninstall-am: uninstall-armdocDATA uninstall-dtbDATA \ uninstall-or1kdocDATA uninstall-pkgincludeHEADERS \ uninstall-ppcdocDATA uninstall-rxdocDATA -.MAKE: $(am__recursive_targets) all check-am install-am install-strip +.MAKE: $(am__recursive_targets) all check check-am install install-am \ + install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--refresh check check-DEJAGNU check-TESTS check-am clean \ diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk index 7221dafa9b2..4ba1f461303 100644 --- a/sim/bpf/local.mk +++ b/sim/bpf/local.mk @@ -23,11 +23,13 @@ noinst_PROGRAMS += %D%/run -%C%_BUILD_OUTPUTS = \ +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += \ %D%/eng-le.h \ + %D%/eng-be.h +%C%_BUILD_OUTPUTS = \ %D%/mloop-le.c \ %D%/stamp-mloop-le \ - %D%/eng-be.h \ %D%/mloop-be.c \ %D%/stamp-mloop-be diff --git a/sim/cr16/local.mk b/sim/cr16/local.mk index cb0d6051b75..f5401f6d5f9 100644 --- a/sim/cr16/local.mk +++ b/sim/cr16/local.mk @@ -24,9 +24,10 @@ noinst_PROGRAMS += %D%/run +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/simops.h %C%_BUILD_OUTPUTS = \ %D%/gencode$(EXEEXT) \ - %D%/simops.h \ %D%/table.c ## This makes sure build tools are available before building the arch-subdirs. diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 96c6e738da9..0e56fefa960 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -34,11 +34,13 @@ AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" check_PROGRAMS += %D%/rvdummy -%C%_BUILD_OUTPUTS = \ +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += \ %D%/engv10.h \ + %D%/engv32.h +%C%_BUILD_OUTPUTS = \ %D%/mloopv10f.c \ %D%/stamp-mloop-v10f \ - %D%/engv32.h \ %D%/mloopv32f.c \ %D%/stamp-mloop-v32f diff --git a/sim/d10v/local.mk b/sim/d10v/local.mk index ba9a754245c..38a3c9263d6 100644 --- a/sim/d10v/local.mk +++ b/sim/d10v/local.mk @@ -24,9 +24,10 @@ noinst_PROGRAMS += %D%/run +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/simops.h %C%_BUILD_OUTPUTS = \ %D%/gencode$(EXEEXT) \ - %D%/simops.h \ %D%/table.c ## This makes sure build tools are available before building the arch-subdirs. diff --git a/sim/frv/local.mk b/sim/frv/local.mk index d5fdd1dba30..11db636a715 100644 --- a/sim/frv/local.mk +++ b/sim/frv/local.mk @@ -27,8 +27,9 @@ noinst_PROGRAMS += %D%/run %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/README +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/eng.h %C%_BUILD_OUTPUTS = \ - %D%/eng.h \ %D%/mloop.c \ %D%/stamp-mloop diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk index 639a712c1f7..881cf2c55dc 100644 --- a/sim/iq2000/local.mk +++ b/sim/iq2000/local.mk @@ -24,8 +24,9 @@ noinst_PROGRAMS += %D%/run +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/eng.h %C%_BUILD_OUTPUTS = \ - %D%/eng.h \ %D%/mloop.c \ %D%/stamp-mloop diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index bdef055b6e3..3f9606410d6 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -27,8 +27,9 @@ noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = lm32cpu lm32timer lm32uart AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/eng.h %C%_BUILD_OUTPUTS = \ - %D%/eng.h \ %D%/mloop.c \ %D%/stamp-mloop diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index a5e5d8829a5..4f9f2bc257d 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -27,14 +27,16 @@ noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" -%C%_BUILD_OUTPUTS = \ +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += \ %D%/eng.h \ + %D%/engx.h \ + %D%/eng2.h +%C%_BUILD_OUTPUTS = \ %D%/mloop.c \ %D%/stamp-mloop \ - %D%/engx.h \ %D%/mloopx.c \ %D%/stamp-mloop-x \ - %D%/eng2.h \ %D%/mloop2.c \ %D%/stamp-mloop-2 diff --git a/sim/mips/local.mk b/sim/mips/local.mk index b7efc3947de..fa70edde35b 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -27,6 +27,8 @@ noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/itable.h %C%_BUILT_SRC_FROM_IGEN_ITABLE = \ %D%/itable.h \ %D%/itable.c diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk index de229ec490e..afb1df75f2e 100644 --- a/sim/mn10300/local.mk +++ b/sim/mn10300/local.mk @@ -27,6 +27,15 @@ noinst_PROGRAMS += %D%/run %C%_SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += \ + %D%/icache.h \ + %D%/idecode.h \ + %D%/semantics.h \ + %D%/model.h \ + %D%/support.h \ + %D%/itable.h \ + %D%/engine.h %C%_BUILT_SRC_FROM_IGEN = \ %D%/icache.h \ %D%/icache.c \ diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index b1181434529..ef8ae2a6abc 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -26,8 +26,9 @@ noinst_PROGRAMS += %D%/run %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/README +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += %D%/eng.h %C%_BUILD_OUTPUTS = \ - %D%/eng.h \ %D%/mloop.c \ %D%/stamp-mloop diff --git a/sim/v850/local.mk b/sim/v850/local.mk index b2dd5778691..4741e070a30 100644 --- a/sim/v850/local.mk +++ b/sim/v850/local.mk @@ -24,6 +24,15 @@ noinst_PROGRAMS += %D%/run +## List all generated headers to help Automake dependency tracking. +BUILT_SOURCES += \ + %D%/icache.h \ + %D%/idecode.h \ + %D%/semantics.h \ + %D%/model.h \ + %D%/support.h \ + %D%/itable.h \ + %D%/engine.h %C%_BUILT_SRC_FROM_IGEN = \ %D%/icache.h \ %D%/icache.c \ -- 2.30.2