From: Mike Frysinger Date: Sun, 6 Nov 2022 14:40:56 +0000 (+0700) Subject: sim: build: hoist lists of hw devices up X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d0421178673d74a790637e31fed944bf48aa3aa;p=binutils-gdb.git sim: build: hoist lists of hw devices up We need these in the top-level to generate libsim.a, but also in the subdirs to generate hw-config.h. Move it to the local.mk, and pass it down when running recursive make. This avoids duplication, and makes it available to both. We can simplify this once we move the various steps up to the top-level too. --- diff --git a/sim/Makefile.in b/sim/Makefile.in index e465a6c4fdb..085afcfc632 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -145,74 +145,81 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_arm_TRUE@am__append_9 = arm/run @SIM_ENABLE_ARCH_avr_TRUE@am__append_10 = avr/run @SIM_ENABLE_ARCH_bfin_TRUE@am__append_11 = bfin/run -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_12 = bpf/run -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_13 = $(bpf_BUILD_OUTPUTS) +@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_cr16_TRUE@am__append_15 = cr16/run -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_16 = $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_17 = cr16/gencode -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_18 = $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cris_TRUE@am__append_19 = cris/run -@SIM_ENABLE_ARCH_cris_TRUE@am__append_20 = cris/rvdummy -@SIM_ENABLE_ARCH_cris_TRUE@am__append_21 = $(cris_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cris_TRUE@am__append_22 = $(cris_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_23 = d10v/run -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_24 = $(d10v_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_25 = d10v/gencode +@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_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_erc32_TRUE@am__append_27 = erc32/run erc32/sis -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_28 = sim-%D-install-exec-local -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_29 = sim-erc32-uninstall-local -@SIM_ENABLE_ARCH_examples_TRUE@am__append_30 = example-synacor/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_31 = frv/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_32 = $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_frv_TRUE@am__append_33 = $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ft32_TRUE@am__append_34 = ft32/run -@SIM_ENABLE_ARCH_h8300_TRUE@am__append_35 = h8300/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_36 = iq2000/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_37 = $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_38 = $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_39 = lm32/run -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_40 = $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_41 = $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_42 = m32c/run -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_43 = $(m32c_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_44 = m32c/opc2c -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_45 = \ +@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_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_46 = m32r/run -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_47 = $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_48 = $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_49 = m68hc11/run -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_50 = $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_51 = m68hc11/gencode -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_52 = $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mcore_TRUE@am__append_53 = mcore/run -@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_54 = microblaze/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_55 = mips/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_56 = mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_57 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_58 = $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_59 = moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_60 = msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_61 = or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_62 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_63 = $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_64 = ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_65 = pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_66 = riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_67 = rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_68 = rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_69 = sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_70 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_71 = sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_72 = $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_73 = v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_74 = $(v850_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_75 = $(v850_BUILD_OUTPUTS) +@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_mn10300_TRUE@am__append_62 = mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_63 = mn10300_SIM_EXTRA_HW_DEVICES="$(mn10300_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_64 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_65 = $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_66 = moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_67 = msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_68 = or1k/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_69 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_70 = $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_71 = ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_72 = pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_73 = riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_74 = rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_75 = rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_76 = sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_77 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_78 = sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_79 = $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_80 = v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_81 = $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_82 = $(v850_BUILD_OUTPUTS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -1176,7 +1183,9 @@ srccom = $(srcdir)/common srcroot = $(srcdir)/.. SUBDIRS = @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS = SIM_NEW_COMMON_OBJS_="$(SIM_NEW_COMMON_OBJS)" \ - $(am__append_3) + $(am__append_3) $(am__append_12) $(am__append_21) \ + $(am__append_42) $(am__append_50) $(am__append_54) \ + $(am__append_61) $(am__append_63) pkginclude_HEADERS = $(am__append_1) noinst_LIBRARIES = $(SIM_COMMON_LIB) $(am__append_5) CLEANFILES = common/version.c common/version.c-stamp \ @@ -1185,11 +1194,11 @@ CLEANFILES = common/version.c common/version.c-stamp \ testsuite/common/bits64m63.c DISTCLEANFILES = MOSTLYCLEANFILES = core $(am__append_7) site-sim-config.exp \ - testrun.log testrun.sum $(am__append_14) $(am__append_18) \ - $(am__append_22) $(am__append_26) $(am__append_33) \ - $(am__append_38) $(am__append_41) $(am__append_45) \ - $(am__append_48) $(am__append_52) $(am__append_58) \ - $(am__append_63) $(am__append_72) $(am__append_75) + 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_65) \ + $(am__append_70) $(am__append_79) $(am__append_82) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1199,14 +1208,14 @@ 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 $(am__append_4) \ - $(am__append_13) $(am__append_16) $(am__append_21) \ - $(am__append_24) $(am__append_32) $(am__append_37) \ - $(am__append_40) $(am__append_43) $(am__append_47) \ - $(am__append_50) $(am__append_57) $(am__append_62) \ - $(am__append_70) $(am__append_74) + $(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_64) $(am__append_69) \ + $(am__append_77) $(am__append_81) SIM_INSTALL_DATA_LOCAL_DEPS = -SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_28) -SIM_UNINSTALL_LOCAL_DEPS = $(am__append_29) +SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_30) +SIM_UNINSTALL_LOCAL_DEPS = $(am__append_31) SIM_COMMON_LIB = common/libcommon.a common_libcommon_a_SOURCES = \ common/callback.c \ @@ -1340,6 +1349,39 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_bfin_TRUE@ bfin/libsim.a \ @SIM_ENABLE_ARCH_bfin_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_bfin_TRUE@bfin_SIM_EXTRA_HW_DEVICES = \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_cec \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_ctimer \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_dma \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_dmac \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_ebiu_amc \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_ebiu_ddrc \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_ebiu_sdc \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_emac \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_eppi \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_evt \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_gpio \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_gpio2 \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_gptimer \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_jtag \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_mmu \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_nfc \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_otp \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_pfmon \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_pint \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_pll \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_ppi \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_rtc \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_sic \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_spi \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_trace \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_twi \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_uart \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_uart2 \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_wdog \ +@SIM_ENABLE_ARCH_bfin_TRUE@ bfin_wp \ +@SIM_ENABLE_ARCH_bfin_TRUE@ eth_phy + @SIM_ENABLE_ARCH_bpf_TRUE@bpf_run_SOURCES = @SIM_ENABLE_ARCH_bpf_TRUE@bpf_run_LDADD = \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/nrun.o \ @@ -1373,6 +1415,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/libsim.a \ @SIM_ENABLE_ARCH_cris_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_cris_TRUE@cris_SIM_EXTRA_HW_DEVICES = rv cris cris_900000xx @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 = \ @@ -1452,6 +1495,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/libsim.a \ @SIM_ENABLE_ARCH_lm32_TRUE@ $(SIM_COMMON_LIBS) +@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 \ @@ -1479,6 +1523,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/libsim.a \ @SIM_ENABLE_ARCH_m32r_TRUE@ $(SIM_COMMON_LIBS) +@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 \ @@ -1496,6 +1541,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ m68hc11/libsim.a \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11_SIM_EXTRA_HW_DEVICES = m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11_BUILD_OUTPUTS = \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ m68hc11/gencode$(EXEEXT) \ @SIM_ENABLE_ARCH_m68hc11_TRUE@ m68hc11/m68hc11int.c \ @@ -1520,12 +1566,14 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_mips_TRUE@ mips/libsim.a \ @SIM_ENABLE_ARCH_mips_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_mips_TRUE@mips_SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_run_SOURCES = @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_run_LDADD = \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/nrun.o \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/libsim.a \ @SIM_ENABLE_ARCH_mn10300_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300_BUILT_SRC_FROM_IGEN = \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/icache.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/icache.c \ diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in index 0655a06d5f2..5d8a8a6386c 100644 --- a/sim/bfin/Makefile.in +++ b/sim/bfin/Makefile.in @@ -17,6 +17,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = bfin + SIM_OBJS = \ $(SIM_NEW_COMMON_OBJS) \ bfin-sim.o \ @@ -26,39 +28,6 @@ SIM_OBJS = \ machs.o \ sim-resume.o -SIM_EXTRA_HW_DEVICES = \ - bfin_cec \ - bfin_ctimer \ - bfin_dma \ - bfin_dmac \ - bfin_ebiu_amc \ - bfin_ebiu_ddrc \ - bfin_ebiu_sdc \ - bfin_emac \ - bfin_eppi \ - bfin_evt \ - bfin_gpio \ - bfin_gpio2 \ - bfin_gptimer \ - bfin_jtag \ - bfin_mmu \ - bfin_nfc \ - bfin_otp \ - bfin_pfmon \ - bfin_pint \ - bfin_pll \ - bfin_ppi \ - bfin_rtc \ - bfin_sic \ - bfin_spi \ - bfin_trace \ - bfin_twi \ - bfin_uart \ - bfin_uart2 \ - bfin_wdog \ - bfin_wp \ - eth_phy - SIM_EXTRA_CFLAGS = $(SDL_CFLAGS) ## COMMON_POST_CONFIG_FRAG diff --git a/sim/bfin/local.mk b/sim/bfin/local.mk index 956b3aec30d..cab9e796698 100644 --- a/sim/bfin/local.mk +++ b/sim/bfin/local.mk @@ -24,6 +24,40 @@ noinst_PROGRAMS += %D%/run +%C%_SIM_EXTRA_HW_DEVICES = \ + bfin_cec \ + bfin_ctimer \ + bfin_dma \ + bfin_dmac \ + bfin_ebiu_amc \ + bfin_ebiu_ddrc \ + bfin_ebiu_sdc \ + bfin_emac \ + bfin_eppi \ + bfin_evt \ + bfin_gpio \ + bfin_gpio2 \ + bfin_gptimer \ + bfin_jtag \ + bfin_mmu \ + bfin_nfc \ + bfin_otp \ + bfin_pfmon \ + bfin_pint \ + bfin_pll \ + bfin_ppi \ + bfin_rtc \ + bfin_sic \ + bfin_spi \ + bfin_trace \ + bfin_twi \ + bfin_uart \ + bfin_uart2 \ + bfin_wdog \ + bfin_wp \ + eth_phy +AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" + %D%/linux-fixed-code.h: @MAINT@ $(srcdir)/%D%/linux-fixed-code.s %D%/local.mk %D%/$(am__dirstamp) $(AM_V_GEN)$(AS_FOR_TARGET_BFIN) $(srcdir)/%D%/linux-fixed-code.s -o %D%/linux-fixed-code.o $(AM_V_at)(\ diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 684d7d847ab..ff4e1710202 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -136,7 +136,7 @@ BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) -SIM_HW_DEVICES = $(SIM_HW_DEVICES_) $(SIM_EXTRA_HW_DEVICES) +SIM_HW_DEVICES = $(SIM_HW_DEVICES_) $($(arch)_SIM_EXTRA_HW_DEVICES) SIM_NEW_COMMON_OBJS = $(SIM_NEW_COMMON_OBJS_) $(SIM_HW_OBJS) LIBIBERTY_LIB = ../../libiberty/libiberty.a diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 3474eb9a827..4242b17c756 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -19,6 +19,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = cris + CRISV10F_OBJS = crisv10f.o cpuv10.o decodev10.o modelv10.o mloopv10f.o CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o @@ -31,14 +33,10 @@ SIM_OBJS = \ $(CRISV32F_OBJS) \ traps.o -SIM_EXTRA_HW_DEVICES = rv cris cris_900000xx - SIM_EXTRA_CLEAN = cris-clean ## COMMON_POST_CONFIG_FRAG -arch = cris - cris-clean: -rm -f stamp-arch -rm -f tmp-* diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 0a3423c3389..826d6de0be4 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -24,6 +24,9 @@ noinst_PROGRAMS += %D%/run +%C%_SIM_EXTRA_HW_DEVICES = rv cris cris_900000xx +AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" + ## rvdummy is just used for testing -- it runs on the same host as `run`. ## It does nothing if --enable-sim-hardware isn't active. %C%_rvdummy_SOURCES = %D%/rvdummy.c diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index 5d78e36bf6b..ea6601fab06 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -3,6 +3,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = lm32 + # List of object files, less common parts. SIM_OBJS = \ $(SIM_NEW_COMMON_OBJS) \ @@ -12,14 +14,10 @@ SIM_OBJS = \ cpu.o decode.o sem.o model.o mloop.o \ lm32.o traps.o user.o -SIM_EXTRA_HW_DEVICES = lm32cpu lm32timer lm32uart - SIM_EXTRA_CLEAN = lm32-clean ## COMMON_POST_CONFIG_FRAG -arch = lm32 - lm32-clean: rm -f stamp-arch stamp-cpu rm -f tmp-* diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index 7add85ac98b..437ec094e9c 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -24,6 +24,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)" + %C%_BUILD_OUTPUTS = \ %D%/eng.h \ %D%/mloop.c \ diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index 6a0e2e5fcf5..97afd6e03a3 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -19,6 +19,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = m32r + M32R_OBJS = m32r.o cpu.o decode.o sem.o model.o mloop.o M32RX_OBJS = m32rx.o cpux.o decodex.o modelx.o mloopx.o M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o @@ -33,8 +35,6 @@ SIM_OBJS = \ $(M32R2_OBJS) \ traps.o -SIM_EXTRA_HW_DEVICES = m32r_cache m32r_uart - SIM_EXTRA_CLEAN = m32r-clean # Some modules don't build cleanly yet. @@ -42,8 +42,6 @@ cpu.o cpu2.o cpux.o m32r.o m32r2.o m32rx.o mloop.o mloop2.o mloopx.o sem.o sim-i ## COMMON_POST_CONFIG_FRAG -arch = m32r - m32r-clean: rm -f stamp-arch stamp-cpu stamp-xcpu stamp-2cpu rm -f tmp-* diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index 51d9d3413d6..dff09fbf15c 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -24,6 +24,9 @@ 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 = \ %D%/eng.h \ %D%/mloop.c \ diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 6b7fcfffb18..c16f5fce285 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -17,6 +17,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = m68hc11 + M68HC11_OBJS = interp.o m68hc11int.o m68hc12int.o \ emulos.o interrupts.o m68hc11_sim.o @@ -24,8 +26,6 @@ SIM_OBJS = $(M68HC11_OBJS) \ $(SIM_NEW_COMMON_OBJS) \ sim-resume.o -SIM_EXTRA_HW_DEVICES = m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram - # We must use 32-bit addresses to support memory bank switching. # The WORD_BITSIZE is normally 16 but must be switched (temporarily) # to 32 to avoid a bug in the sim-common which uses 'unsigned_word' diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk index 3cc980bf036..35555ed9868 100644 --- a/sim/m68hc11/local.mk +++ b/sim/m68hc11/local.mk @@ -24,6 +24,9 @@ noinst_PROGRAMS += %D%/run +%C%_SIM_EXTRA_HW_DEVICES = m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram +AM_MAKEFLAGS += %C%_SIM_EXTRA_HW_DEVICES="$(%C%_SIM_EXTRA_HW_DEVICES)" + %C%_BUILD_OUTPUTS = \ %D%/gencode$(EXEEXT) \ %D%/m68hc11int.c \ diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 75438be5a18..eadb34697c8 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -3,6 +3,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = mips + # Object files created by various simulator generators. @@ -64,8 +66,6 @@ SIM_OBJS = \ sim-main.o \ sim-resume.o \ -SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio - # List of flags to always pass to $(CC). SIM_SUBTARGET=@SIM_SUBTARGET@ SIM_EXTRA_CFLAGS = $(SIM_SUBTARGET) diff --git a/sim/mips/local.mk b/sim/mips/local.mk index 8e266e77b36..159fd2947d4 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -23,3 +23,6 @@ $(SIM_COMMON_LIBS) 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)" diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index 521f86c644b..0b3ebd5b74e 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -17,6 +17,8 @@ ## COMMON_PRE_CONFIG_FRAG +arch = mn10300 + MN10300_OBJS = \ itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \ $(SIM_NEW_COMMON_OBJS) \ @@ -25,8 +27,6 @@ MN10300_OBJS = \ SIM_OBJS = $(MN10300_OBJS) interp.o -SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop - # List of extra flags to always pass to $(CC). SIM_EXTRA_CFLAGS = \ -DPOLL_QUIT_INTERVAL=0x20 \ diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk index 08a3d4dedc4..70b442fe1a0 100644 --- a/sim/mn10300/local.mk +++ b/sim/mn10300/local.mk @@ -24,6 +24,9 @@ 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)" + %C%_BUILT_SRC_FROM_IGEN = \ %D%/icache.h \ %D%/icache.c \