From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 407363858409; Tue, 10 Jan 2023 06:22:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 407363858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673331765; bh=W49yyR7+SJGGCVczfHrzNka0YrL6Uvj40zqimn667/Y=; h=From:To:Subject:Date:From; b=npHiVYlZcCxlHD3UgWq5K7E9D6vRlcS3ghe4cpJMCcgDnlSRA25fHRsI+Xcy+jHSe dmGxg2VnSKRREdFtY0ouA0sSjyHrHF4iMJ1+cflF7ftWLJIcouZTrjlfoLcYg5T7wk awu3/2K5R5SKpCDmFN2MpbgFebRvZh4CKQyBC4kA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: aarch64: move libsim.a creation to top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 7a1e1f94636358e642631869d0918e758feefd03 X-Git-Newrev: c58353b7862213558bd5069a8c1e3f0877420b73 Message-Id: <20230110062245.407363858409@sourceware.org> Date: Tue, 10 Jan 2023 06:22:45 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc58353b78622= 13558bd5069a8c1e3f0877420b73 commit c58353b7862213558bd5069a8c1e3f0877420b73 Author: Mike Frysinger Date: Sun Nov 6 22:25:18 2022 +0700 sim: aarch64: move libsim.a creation to top-level =20 The objects are still compiled in the subdir, but the creation of the archive itself is in the top-level. This is a required step before we can move compilation itself up, and makes it easier to review. =20 The downside is that each object compile is a recursive make instead of a single one. On my 4 core system, it adds ~100msec to the build per port, so it's not great, but it shouldn't be a big deal. This will go away of course once the top-level compiles objects. Diff: --- sim/Makefile.in | 280 ++++++++++++++++++++++++++----------------= ---- sim/aarch64/Makefile.in | 9 +- sim/aarch64/local.mk | 21 ++++ sim/common/Make-common.in | 3 +- 4 files changed, 184 insertions(+), 129 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index d04260f0e74..ab7a8efa75a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -141,105 +141,106 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ testsuite/common/bits64m0$(EXEEXT) \ testsuite/common/bits64m63$(EXEEXT) \ testsuite/common/alu-tst$(EXEEXT) -@SIM_ENABLE_ARCH_aarch64_TRUE@am__append_8 =3D aarch64/run -@SIM_ENABLE_ARCH_arm_TRUE@am__append_9 =3D arm/run -@SIM_ENABLE_ARCH_avr_TRUE@am__append_10 =3D avr/run -@SIM_ENABLE_ARCH_bfin_TRUE@am__append_11 =3D bfin/run -@SIM_ENABLE_ARCH_bfin_TRUE@am__append_12 =3D bfin_SIM_EXTRA_HW_DEVICES=3D"= $(bfin_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_13 =3D bpf/run -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_14 =3D \ +@SIM_ENABLE_ARCH_aarch64_TRUE@am__append_8 =3D aarch64/libsim.a +@SIM_ENABLE_ARCH_aarch64_TRUE@am__append_9 =3D aarch64/run +@SIM_ENABLE_ARCH_arm_TRUE@am__append_10 =3D arm/run +@SIM_ENABLE_ARCH_avr_TRUE@am__append_11 =3D avr/run +@SIM_ENABLE_ARCH_bfin_TRUE@am__append_12 =3D bfin/run +@SIM_ENABLE_ARCH_bfin_TRUE@am__append_13 =3D bfin_SIM_EXTRA_HW_DEVICES=3D"= $(bfin_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_bpf_TRUE@am__append_14 =3D bpf/run +@SIM_ENABLE_ARCH_bpf_TRUE@am__append_15 =3D \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-le.h \ @SIM_ENABLE_ARCH_bpf_TRUE@ bpf/eng-be.h =20 -@SIM_ENABLE_ARCH_bpf_TRUE@am__append_15 =3D $(bpf_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_bpf_TRUE@am__append_16 =3D $(bpf_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_17 =3D cr16/run -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_18 =3D cr16/simops.h -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_19 =3D $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_20 =3D cr16/gencode -@SIM_ENABLE_ARCH_cr16_TRUE@am__append_21 =3D $(cr16_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_cris_TRUE@am__append_22 =3D cris/run -@SIM_ENABLE_ARCH_cris_TRUE@am__append_23 =3D cris_SIM_EXTRA_HW_DEVICES=3D"= $(cris_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_cris_TRUE@am__append_24 =3D cris/rvdummy -@SIM_ENABLE_ARCH_cris_TRUE@am__append_25 =3D \ +@SIM_ENABLE_ARCH_bpf_TRUE@am__append_17 =3D $(bpf_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_18 =3D cr16/run +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_19 =3D cr16/simops.h +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_20 =3D $(cr16_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_21 =3D cr16/gencode +@SIM_ENABLE_ARCH_cr16_TRUE@am__append_22 =3D $(cr16_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cris_TRUE@am__append_23 =3D cris/run +@SIM_ENABLE_ARCH_cris_TRUE@am__append_24 =3D cris_SIM_EXTRA_HW_DEVICES=3D"= $(cris_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_cris_TRUE@am__append_25 =3D cris/rvdummy +@SIM_ENABLE_ARCH_cris_TRUE@am__append_26 =3D \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/engv10.h \ @SIM_ENABLE_ARCH_cris_TRUE@ cris/engv32.h =20 -@SIM_ENABLE_ARCH_cris_TRUE@am__append_26 =3D $(cris_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_cris_TRUE@am__append_27 =3D $(cris_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_28 =3D d10v/run -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_29 =3D d10v/simops.h -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_30 =3D $(d10v_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_31 =3D d10v/gencode -@SIM_ENABLE_ARCH_d10v_TRUE@am__append_32 =3D $(d10v_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_33 =3D erc32/run erc32/sis -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_34 =3D sim-%D-install-exec-local -@SIM_ENABLE_ARCH_erc32_TRUE@am__append_35 =3D sim-erc32-uninstall-local -@SIM_ENABLE_ARCH_examples_TRUE@am__append_36 =3D example-synacor/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_37 =3D frv/run -@SIM_ENABLE_ARCH_frv_TRUE@am__append_38 =3D frv/eng.h -@SIM_ENABLE_ARCH_frv_TRUE@am__append_39 =3D $(frv_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_cris_TRUE@am__append_28 =3D $(cris_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_29 =3D d10v/run +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_30 =3D d10v/simops.h +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_31 =3D $(d10v_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_32 =3D d10v/gencode +@SIM_ENABLE_ARCH_d10v_TRUE@am__append_33 =3D $(d10v_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_34 =3D erc32/run erc32/sis +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_35 =3D sim-%D-install-exec-local +@SIM_ENABLE_ARCH_erc32_TRUE@am__append_36 =3D sim-erc32-uninstall-local +@SIM_ENABLE_ARCH_examples_TRUE@am__append_37 =3D example-synacor/run +@SIM_ENABLE_ARCH_frv_TRUE@am__append_38 =3D frv/run +@SIM_ENABLE_ARCH_frv_TRUE@am__append_39 =3D frv/eng.h @SIM_ENABLE_ARCH_frv_TRUE@am__append_40 =3D $(frv_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ft32_TRUE@am__append_41 =3D ft32/run -@SIM_ENABLE_ARCH_h8300_TRUE@am__append_42 =3D h8300/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_43 =3D iq2000/run -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_44 =3D iq2000/eng.h -@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_45 =3D $(iq2000_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_frv_TRUE@am__append_41 =3D $(frv_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ft32_TRUE@am__append_42 =3D ft32/run +@SIM_ENABLE_ARCH_h8300_TRUE@am__append_43 =3D h8300/run +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_44 =3D iq2000/run +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_45 =3D iq2000/eng.h @SIM_ENABLE_ARCH_iq2000_TRUE@am__append_46 =3D $(iq2000_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_47 =3D lm32/run -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_48 =3D lm32_SIM_EXTRA_HW_DEVICES=3D"= $(lm32_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_49 =3D lm32/eng.h -@SIM_ENABLE_ARCH_lm32_TRUE@am__append_50 =3D $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_iq2000_TRUE@am__append_47 =3D $(iq2000_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_48 =3D lm32/run +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_49 =3D lm32_SIM_EXTRA_HW_DEVICES=3D"= $(lm32_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_50 =3D lm32/eng.h @SIM_ENABLE_ARCH_lm32_TRUE@am__append_51 =3D $(lm32_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_52 =3D m32c/run -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_53 =3D $(m32c_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_54 =3D m32c/opc2c -@SIM_ENABLE_ARCH_m32c_TRUE@am__append_55 =3D \ +@SIM_ENABLE_ARCH_lm32_TRUE@am__append_52 =3D $(lm32_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_53 =3D m32c/run +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_54 =3D $(m32c_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_55 =3D m32c/opc2c +@SIM_ENABLE_ARCH_m32c_TRUE@am__append_56 =3D \ @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 =20 -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_56 =3D m32r/run -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_57 =3D m32r_SIM_EXTRA_HW_DEVICES=3D"= $(m32r_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_58 =3D \ +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_57 =3D m32r/run +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_58 =3D m32r_SIM_EXTRA_HW_DEVICES=3D"= $(m32r_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_59 =3D \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng.h \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/engx.h \ @SIM_ENABLE_ARCH_m32r_TRUE@ m32r/eng2.h =20 -@SIM_ENABLE_ARCH_m32r_TRUE@am__append_59 =3D $(m32r_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_m32r_TRUE@am__append_60 =3D $(m32r_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_61 =3D m68hc11/run -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_62 =3D m68hc11_SIM_EXTRA_HW_DEVIC= ES=3D"$(m68hc11_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_63 =3D $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_64 =3D m68hc11/gencode -@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_65 =3D $(m68hc11_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mcore_TRUE@am__append_66 =3D mcore/run -@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_67 =3D microblaze/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_68 =3D mips/run -@SIM_ENABLE_ARCH_mips_TRUE@am__append_69 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mips_TRUE@am__append_70 =3D mips/itable.h \ +@SIM_ENABLE_ARCH_m32r_TRUE@am__append_61 =3D $(m32r_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_62 =3D m68hc11/run +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_63 =3D m68hc11_SIM_EXTRA_HW_DEVIC= ES=3D"$(m68hc11_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_64 =3D $(m68hc11_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_65 =3D m68hc11/gencode +@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_66 =3D $(m68hc11_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mcore_TRUE@am__append_67 =3D mcore/run +@SIM_ENABLE_ARCH_microblaze_TRUE@am__append_68 =3D microblaze/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_69 =3D mips/run +@SIM_ENABLE_ARCH_mips_TRUE@am__append_70 =3D mips_SIM_EXTRA_HW_DEVICES=3D"= $(mips_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mips_TRUE@am__append_71 =3D mips/itable.h \ @SIM_ENABLE_ARCH_mips_TRUE@ $(SIM_MIPS_MULTI_SRC) -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_71 = =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@am__append_72 = =3D \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ $(mips_BUILT_SR= C_FROM_GEN_MODE_SINGLE) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_SINGLE_TRUE@ mips/stamp-gen-= mode-single =20 -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_72 =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@am__append_73 =3D \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_F= ROM_GEN_MODE_M16_M16) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ $(mips_BUILT_SRC_F= ROM_GEN_MODE_M16_M32) \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mod= e-m16-m16 \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_M16_TRUE@ mips/stamp-gen-mod= e-m16-m32 =20 -@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_73 =3D= \ +@SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@am__append_74 =3D= \ @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-m= ode-multi-igen \ @SIM_ENABLE_ARCH_mips_TRUE@@SIM_MIPS_GEN_MODE_MULTI_TRUE@ mips/stamp-gen-m= ode-multi-run =20 -@SIM_ENABLE_ARCH_mips_TRUE@am__append_74 =3D $(mips_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mips_TRUE@am__append_75 =3D $(mips_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_mips_TRUE@am__append_76 =3D mips/multi-include.h mips/mul= ti-run.c -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_77 =3D mn10300/run -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_78 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_79 =3D \ +@SIM_ENABLE_ARCH_mips_TRUE@am__append_76 =3D $(mips_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mips_TRUE@am__append_77 =3D mips/multi-include.h mips/mul= ti-run.c +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_78 =3D mn10300/run +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_79 =3D mn10300_SIM_EXTRA_HW_DEVIC= ES=3D"$(mn10300_SIM_EXTRA_HW_DEVICES)" +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_80 =3D \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/icache.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/idecode.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/semantics.h \ @@ -248,29 +249,29 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/itable.h \ @SIM_ENABLE_ARCH_mn10300_TRUE@ mn10300/engine.h =20 -@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_80 =3D $(mn10300_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_81 =3D $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_moxie_TRUE@am__append_82 =3D moxie/run -@SIM_ENABLE_ARCH_msp430_TRUE@am__append_83 =3D msp430/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_84 =3D or1k/run -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_85 =3D or1k/eng.h -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_86 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_82 =3D $(mn10300_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_83 =3D moxie/run +@SIM_ENABLE_ARCH_msp430_TRUE@am__append_84 =3D msp430/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_85 =3D or1k/run +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_86 =3D or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@am__append_87 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_88 =3D ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_89 =3D pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_90 =3D riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_91 =3D rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_92 =3D rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_93 =3D sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_94 =3D \ +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_88 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_89 =3D ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_90 =3D pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_91 =3D riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_92 =3D rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_93 =3D rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_94 =3D sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_95 =3D \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/code.c \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/ppi.c =20 -@SIM_ENABLE_ARCH_sh_TRUE@am__append_95 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_96 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_97 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_98 =3D v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_99 =3D \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_96 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_97 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_98 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_99 =3D v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_100 =3D \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/icache.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/idecode.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/semantics.h \ @@ -279,8 +280,8 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/itable.h \ @SIM_ENABLE_ARCH_v850_TRUE@ v850/engine.h =20 -@SIM_ENABLE_ARCH_v850_TRUE@am__append_100 =3D $(v850_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_101 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_102 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -346,9 +347,23 @@ AM_V_AR =3D $(am__v_AR_@AM_V@) am__v_AR_ =3D $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 =3D @echo " AR " $@; am__v_AR_1 =3D=20 +aarch64_libsim_a_AR =3D $(AR) $(ARFLAGS) +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_libsim_a_DEPENDENCIES =3D \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ %,aarch64/%,$(SIM_NEW_COMMON_OBJS)) \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(patsubst \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ %,aarch64/dv-%.o,$(SIM_HW_DEVICES)) \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/cpustate.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/interp.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/memory.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/modules.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/sim-resume.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/simulator.o +am_aarch64_libsim_a_OBJECTS =3D +aarch64_libsim_a_OBJECTS =3D $(am_aarch64_libsim_a_OBJECTS) +am__dirstamp =3D $(am__leading_dot)dirstamp common_libcommon_a_AR =3D $(AR) $(ARFLAGS) common_libcommon_a_LIBADD =3D -am__dirstamp =3D $(am__leading_dot)dirstamp am_common_libcommon_a_OBJECTS =3D common/callback.$(OBJEXT) \ common/portability.$(OBJEXT) common/sim-load.$(OBJEXT) \ common/syscall.$(OBJEXT) common/target-newlib-errno.$(OBJEXT) \ @@ -699,12 +714,13 @@ AM_V_CCLD =3D $(am__v_CCLD_@AM_V@) am__v_CCLD_ =3D $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 =3D @echo " CCLD " $@; am__v_CCLD_1 =3D=20 -SOURCES =3D $(common_libcommon_a_SOURCES) $(igen_libigen_a_SOURCES) \ - $(aarch64_run_SOURCES) $(arm_run_SOURCES) $(avr_run_SOURCES) \ - $(bfin_run_SOURCES) $(bpf_run_SOURCES) $(cr16_gencode_SOURCES) \ - $(cr16_run_SOURCES) $(cris_run_SOURCES) \ - $(cris_rvdummy_SOURCES) $(d10v_gencode_SOURCES) \ - $(d10v_run_SOURCES) $(erc32_run_SOURCES) erc32/sis.c \ +SOURCES =3D $(aarch64_libsim_a_SOURCES) $(common_libcommon_a_SOURCES) \ + $(igen_libigen_a_SOURCES) $(aarch64_run_SOURCES) \ + $(arm_run_SOURCES) $(avr_run_SOURCES) $(bfin_run_SOURCES) \ + $(bpf_run_SOURCES) $(cr16_gencode_SOURCES) $(cr16_run_SOURCES) \ + $(cris_run_SOURCES) $(cris_rvdummy_SOURCES) \ + $(d10v_gencode_SOURCES) $(d10v_run_SOURCES) \ + $(erc32_run_SOURCES) erc32/sis.c \ $(example_synacor_run_SOURCES) $(frv_run_SOURCES) \ $(ft32_run_SOURCES) $(h8300_run_SOURCES) \ $(igen_filter_SOURCES) $(igen_gen_SOURCES) \ @@ -1255,31 +1271,31 @@ srccom =3D $(srcdir)/common srcroot =3D $(srcdir)/.. SUBDIRS =3D @subdirs@ $(SIM_SUBDIRS) AM_MAKEFLAGS =3D SIM_NEW_COMMON_OBJS_=3D"$(SIM_NEW_COMMON_OBJS)" \ - $(am__append_3) $(am__append_12) $(am__append_23) \ - $(am__append_48) $(am__append_57) $(am__append_62) \ - $(am__append_69) $(am__append_78) + $(am__append_3) $(am__append_13) $(am__append_24) \ + $(am__append_49) $(am__append_58) $(am__append_63) \ + $(am__append_70) $(am__append_79) pkginclude_HEADERS =3D $(am__append_1) -noinst_LIBRARIES =3D common/libcommon.a $(am__append_5) -BUILT_SOURCES =3D $(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_94) \ - $(am__append_99) +noinst_LIBRARIES =3D common/libcommon.a $(am__append_5) $(am__append_8) +BUILT_SOURCES =3D $(am__append_15) $(am__append_19) $(am__append_26) \ + $(am__append_30) $(am__append_39) $(am__append_45) \ + $(am__append_50) $(am__append_59) $(am__append_71) \ + $(am__append_80) $(am__append_86) $(am__append_95) \ + $(am__append_100) CLEANFILES =3D 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 =3D $(am__append_76) +DISTCLEANFILES =3D $(am__append_77) MOSTLYCLEANFILES =3D core $(common_HW_CONFIG_H_TARGETS) $(patsubst \ %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \ $(common_GEN_MODULES_C_TARGETS) $(patsubst \ %,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_7) \ - 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_97) $(am__append_101) + site-sim-config.exp testrun.log testrun.sum $(am__append_17) \ + $(am__append_22) $(am__append_28) $(am__append_33) \ + $(am__append_41) $(am__append_47) $(am__append_52) \ + $(am__append_56) $(am__append_61) $(am__append_66) \ + $(am__append_76) $(am__append_82) $(am__append_88) \ + $(am__append_98) $(am__append_102) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \ @@ -1290,15 +1306,15 @@ COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS= _FOR_BUILD) $(CPPFLAGS_FOR_BUIL LINK_FOR_BUILD =3D $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD= ) -o $@ SIM_ALL_RECURSIVE_DEPS =3D common/libcommon.a \ $(common_HW_CONFIG_H_TARGETS) $(common_GEN_MODULES_C_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_95) \ - $(am__append_100) + $(am__append_4) $(am__append_16) $(am__append_20) \ + $(am__append_27) $(am__append_31) $(am__append_40) \ + $(am__append_46) $(am__append_51) $(am__append_54) \ + $(am__append_60) $(am__append_64) $(am__append_75) \ + $(am__append_81) $(am__append_87) $(am__append_96) \ + $(am__append_101) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 -SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_34) -SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_35) +SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_35) +SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_36) common_libcommon_a_SOURCES =3D \ common/callback.c \ common/portability.c \ @@ -1465,6 +1481,18 @@ testsuite_common_CPPFLAGS =3D \ -I$(srcroot)/include \ -I../bfd =20 +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_libsim_a_SOURCES =3D=20 +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_libsim_a_LIBADD =3D \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(common_libcommon_a_OBJECTS) \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(patsubst %,aarch64/%,$(SIM_NEW_COMMON_OBJ= S)) \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(patsubst %,aarch64/dv-%.o,$(SIM_HW_DEVICE= S)) \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/cpustate.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/interp.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/memory.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/modules.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/sim-resume.o \ +@SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/simulator.o + @SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_run_SOURCES =3D=20 @SIM_ENABLE_ARCH_aarch64_TRUE@aarch64_run_LDADD =3D \ @SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/nrun.o \ @@ -1742,8 +1770,8 @@ testsuite_common_CPPFLAGS =3D \ @SIM_ENABLE_ARCH_mips_TRUE@mips_BUILD_OUTPUTS =3D \ @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_71) $(am__append_72) \ -@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_73) +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_72) $(am__append_73) \ +@SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_74) @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_TRACE =3D # -G omit-line-numbers # -G= trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-a= ll @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN =3D $(srcdir)/mips/mips.igen @SIM_ENABLE_ARCH_mips_TRUE@mips_IGEN_INSN_INC =3D \ @@ -2087,6 +2115,14 @@ arch-subdir.mk: $(top_builddir)/config.status $(srcd= ir)/arch-subdir.mk.in =20 clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +aarch64/$(am__dirstamp): + @$(MKDIR_P) aarch64 + @: > aarch64/$(am__dirstamp) + +aarch64/libsim.a: $(aarch64_libsim_a_OBJECTS) $(aarch64_libsim_a_DEPENDENC= IES) $(EXTRA_aarch64_libsim_a_DEPENDENCIES) aarch64/$(am__dirstamp) + $(AM_V_at)-rm -f aarch64/libsim.a + $(AM_V_AR)$(aarch64_libsim_a_AR) aarch64/libsim.a $(aarch64_libsim_a_OBJE= CTS) $(aarch64_libsim_a_LIBADD) + $(AM_V_at)$(RANLIB) aarch64/libsim.a common/$(am__dirstamp): @$(MKDIR_P) common @: > common/$(am__dirstamp) @@ -2176,9 +2212,6 @@ clean-noinstPROGRAMS: list=3D`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -aarch64/$(am__dirstamp): - @$(MKDIR_P) aarch64 - @: > aarch64/$(am__dirstamp) =20 aarch64/run$(EXEEXT): $(aarch64_run_OBJECTS) $(aarch64_run_DEPENDENCIES) $= (EXTRA_aarch64_run_DEPENDENCIES) aarch64/$(am__dirstamp) @rm -f aarch64/run$(EXEEXT) @@ -3496,6 +3529,13 @@ testsuite/common/bits64m63.c: testsuite/common/bits-= gen$(EXEEXT) testsuite/commo $(AM_V_GEN)$< 64 63 little > $@.tmp $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp $(AM_V_at)mv $@.tmp $@ +@SIM_ENABLE_ARCH_aarch64_TRUE@$(aarch64_libsim_a_OBJECTS) $(aarch64_libsim= _a_LIBADD): aarch64/hw-config.h + +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64/%.o: aarch64/%.c +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) = $(@F) + +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64/%.o: common/%.c +@SIM_ENABLE_ARCH_aarch64_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) = $(@F) =20 @SIM_ENABLE_ARCH_bfin_TRUE@bfin/linux-fixed-code.h: @MAINT@ $(srcdir)/bfin= /linux-fixed-code.s bfin/local.mk bfin/$(am__dirstamp) @SIM_ENABLE_ARCH_bfin_TRUE@ $(AM_V_GEN)$(AS_FOR_TARGET_BFIN) $(srcdir)/bfi= n/linux-fixed-code.s -o bfin/linux-fixed-code.o diff --git a/sim/aarch64/Makefile.in b/sim/aarch64/Makefile.in index 0c959d15aae..94c62429157 100644 --- a/sim/aarch64/Makefile.in +++ b/sim/aarch64/Makefile.in @@ -21,13 +21,6 @@ =20 ## COMMON_PRE_CONFIG_FRAG =20 -SIM_OBJS =3D \ - $(SIM_NEW_COMMON_OBJS) \ - interp.o \ - cpustate.o \ - simulator.o \ - memory.o \ - sim-resume.o \ +SIM_LIBSIM =3D =20 ## COMMON_POST_CONFIG_FRAG - diff --git a/sim/aarch64/local.mk b/sim/aarch64/local.mk index 9eed5495093..c986602449a 100644 --- a/sim/aarch64/local.mk +++ b/sim/aarch64/local.mk @@ -16,6 +16,27 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . =20 +%C%_libsim_a_SOURCES =3D +%C%_libsim_a_LIBADD =3D \ + $(common_libcommon_a_OBJECTS) \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + %D%/cpustate.o \ + %D%/interp.o \ + %D%/memory.o \ + %D%/modules.o \ + %D%/sim-resume.o \ + %D%/simulator.o +$(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h + +noinst_LIBRARIES +=3D %D%/libsim.a + +%D%/%.o: %D%/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + +%D%/%.o: common/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + %C%_run_SOURCES =3D %C%_run_LDADD =3D \ %D%/nrun.o \ diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ab26c494359..e14997ae136 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -89,6 +89,7 @@ SIM_OBJS =3D SIM_EXTRA_CFLAGS =3D # List of main object files for `run'. SIM_RUN_OBJS =3D nrun.o +SIM_LIBSIM =3D libsim.a # Dependency of `clean' to clean any extra files. SIM_EXTRA_CLEAN =3D =20 @@ -152,7 +153,7 @@ LINK_FOR_BUILD =3D $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LD= FLAGS_FOR_BUILD) -o $@ =20 RUNTESTFLAGS =3D =20 -all: libsim.a $(SIM_RUN_OBJS) +all: $(SIM_LIBSIM) $(LIB_OBJS) $(SIM_RUN_OBJS) =20 libsim.a: $(LIB_OBJS) $(SILENCE) rm -f libsim.a