From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 54EE73858C66; Wed, 18 Jan 2023 04:32:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 54EE73858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674016364; bh=ng+vrChlzZQcafGwmkSE0BTmXfurSrFk8F5ceeAZ0CM=; h=From:To:Subject:Date:From; b=jb0SAUt34MkTbCMPRKt0HQAeBEte20634Df1FwPPxBt+XHVqhdqk7AUnQbvQMxN5W WLLCQBgYLqVtLuOvH1B55rMz4XggM0Mby+ROtXvwVWI8FV4RfWgzNfj177/uzMNEwu 3gr9QvXk+AdLWm/hRUL/ORqhXDqf6TLGENqqjsyw= 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: ppc: drop local psim link X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 87a5cf5c0ecc8a0965961154602cbb844cb5ee2b X-Git-Newrev: 1b1be68b9b31b6ba5338f09a0a4f4bfc74a2e714 Message-Id: <20230118043244.54EE73858C66@sourceware.org> Date: Wed, 18 Jan 2023 04:32:44 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1b1be68b9b31= b6ba5338f09a0a4f4bfc74a2e714 commit 1b1be68b9b31b6ba5338f09a0a4f4bfc74a2e714 Author: Mike Frysinger Date: Tue Jan 17 23:21:31 2023 -0500 sim: ppc: drop local psim link =20 This has never been installed, and it's not clear anyone cares about it in the local build dir (when the main program is sim/ppc/run), so drop all the logic to simplify. Diff: --- sim/Makefile.in | 41 +++++++++++------------------------------ sim/ppc/local.mk | 5 +---- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 150c8a3bc69..a2e7f98a78b 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -285,7 +285,7 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_or1k_TRUE@am__append_89 =3D or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@am__append_90 =3D $(or1k_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_ppc_TRUE@am__append_91 =3D common/libcommon.a -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_92 =3D ppc/run ppc/psim +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_92 =3D ppc/run @SIM_ENABLE_ARCH_pru_TRUE@am__append_93 =3D pru/libsim.a @SIM_ENABLE_ARCH_pru_TRUE@am__append_94 =3D pru/run @SIM_ENABLE_ARCH_riscv_TRUE@am__append_95 =3D riscv/libsim.a @@ -925,8 +925,7 @@ am__EXEEXT_7 =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_moxie_TRUE@am__EXEEXT_31 =3D moxie/run$(EXEEXT) @SIM_ENABLE_ARCH_msp430_TRUE@am__EXEEXT_32 =3D msp430/run$(EXEEXT) @SIM_ENABLE_ARCH_or1k_TRUE@am__EXEEXT_33 =3D or1k/run$(EXEEXT) -@SIM_ENABLE_ARCH_ppc_TRUE@am__EXEEXT_34 =3D ppc/run$(EXEEXT) \ -@SIM_ENABLE_ARCH_ppc_TRUE@ ppc/psim$(EXEEXT) +@SIM_ENABLE_ARCH_ppc_TRUE@am__EXEEXT_34 =3D ppc/run$(EXEEXT) @SIM_ENABLE_ARCH_pru_TRUE@am__EXEEXT_35 =3D pru/run$(EXEEXT) @SIM_ENABLE_ARCH_riscv_TRUE@am__EXEEXT_36 =3D riscv/run$(EXEEXT) @SIM_ENABLE_ARCH_rl78_TRUE@am__EXEEXT_37 =3D rl78/run$(EXEEXT) @@ -1101,9 +1100,6 @@ am_or1k_run_OBJECTS =3D or1k_run_OBJECTS =3D $(am_or1k_run_OBJECTS) @SIM_ENABLE_ARCH_or1k_TRUE@or1k_run_DEPENDENCIES =3D or1k/nrun.o \ @SIM_ENABLE_ARCH_or1k_TRUE@ or1k/libsim.a $(am__DEPENDENCIES_4) -ppc_psim_SOURCES =3D ppc/psim.c -ppc_psim_OBJECTS =3D ppc/psim.$(OBJEXT) -ppc_psim_LDADD =3D $(LDADD) am_ppc_run_OBJECTS =3D ppc_run_OBJECTS =3D $(am_ppc_run_OBJECTS) @SIM_ENABLE_ARCH_ppc_TRUE@ppc_run_DEPENDENCIES =3D ppc/main.o \ @@ -1247,14 +1243,13 @@ SOURCES =3D $(aarch64_libsim_a_SOURCES) \ $(m68hc11_run_SOURCES) $(mcore_run_SOURCES) \ $(microblaze_run_SOURCES) $(mips_run_SOURCES) \ $(mn10300_run_SOURCES) $(moxie_run_SOURCES) \ - $(msp430_run_SOURCES) $(or1k_run_SOURCES) ppc/psim.c \ - $(ppc_run_SOURCES) $(pru_run_SOURCES) $(riscv_run_SOURCES) \ - $(rl78_run_SOURCES) $(rx_run_SOURCES) $(sh_gencode_SOURCES) \ - $(sh_run_SOURCES) testsuite/common/alu-tst.c \ - testsuite/common/bits-gen.c testsuite/common/bits32m0.c \ - testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ - testsuite/common/bits64m63.c testsuite/common/fpu-tst.c \ - $(v850_run_SOURCES) + $(msp430_run_SOURCES) $(or1k_run_SOURCES) $(ppc_run_SOURCES) \ + $(pru_run_SOURCES) $(riscv_run_SOURCES) $(rl78_run_SOURCES) \ + $(rx_run_SOURCES) $(sh_gencode_SOURCES) $(sh_run_SOURCES) \ + testsuite/common/alu-tst.c testsuite/common/bits-gen.c \ + testsuite/common/bits32m0.c testsuite/common/bits32m31.c \ + testsuite/common/bits64m0.c testsuite/common/bits64m63.c \ + testsuite/common/fpu-tst.c $(v850_run_SOURCES) RECURSIVE_TARGETS =3D all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -3837,14 +3832,6 @@ or1k/run$(EXEEXT): $(or1k_run_OBJECTS) $(or1k_run_DE= PENDENCIES) $(EXTRA_or1k_run ppc/$(am__dirstamp): @$(MKDIR_P) ppc @: > ppc/$(am__dirstamp) -ppc/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) ppc/$(DEPDIR) - @: > ppc/$(DEPDIR)/$(am__dirstamp) -ppc/psim.$(OBJEXT): ppc/$(am__dirstamp) ppc/$(DEPDIR)/$(am__dirstamp) - -@SIM_ENABLE_ARCH_ppc_FALSE@ppc/psim$(EXEEXT): $(ppc_psim_OBJECTS) $(ppc_ps= im_DEPENDENCIES) $(EXTRA_ppc_psim_DEPENDENCIES) ppc/$(am__dirstamp) -@SIM_ENABLE_ARCH_ppc_FALSE@ @rm -f ppc/psim$(EXEEXT) -@SIM_ENABLE_ARCH_ppc_FALSE@ $(AM_V_CCLD)$(LINK) $(ppc_psim_OBJECTS) $(ppc_= psim_LDADD) $(LIBS) =20 ppc/run$(EXEEXT): $(ppc_run_OBJECTS) $(ppc_run_DEPENDENCIES) $(EXTRA_ppc_r= un_DEPENDENCIES) ppc/$(am__dirstamp) @rm -f ppc/run$(EXEEXT) @@ -3930,7 +3917,6 @@ mostlyclean-compile: -rm -f moxie/*.$(OBJEXT) -rm -f msp430/*.$(OBJEXT) -rm -f or1k/*.$(OBJEXT) - -rm -f ppc/*.$(OBJEXT) -rm -f pru/*.$(OBJEXT) -rm -f riscv/*.$(OBJEXT) -rm -f rl78/*.$(OBJEXT) @@ -3999,7 +3985,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@msp430/$(DEPDIR)/modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@or1k/$(DEPDIR)/modules.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ppc/$(DEPDIR)/psim.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@pru/$(DEPDIR)/modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rl78/$(DEPDIR)/modules.Po@am__quote@ @@ -4675,7 +4660,6 @@ distclean-generic: -rm -f msp430/$(am__dirstamp) -rm -f or1k/$(DEPDIR)/$(am__dirstamp) -rm -f or1k/$(am__dirstamp) - -rm -f ppc/$(DEPDIR)/$(am__dirstamp) -rm -f ppc/$(am__dirstamp) -rm -f pru/$(DEPDIR)/$(am__dirstamp) -rm -f pru/$(am__dirstamp) @@ -4704,7 +4688,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-lib= tool \ =20 distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf aarch64/$(DEPDIR) arm/$(DEPDIR) avr/$(DEPDIR) bfin/$(DEPDIR) bpf/= $(DEPDIR) common/$(DEPDIR) cr16/$(DEPDIR) cris/$(DEPDIR) d10v/$(DEPDIR) erc= 32/$(DEPDIR) example-synacor/$(DEPDIR) frv/$(DEPDIR) ft32/$(DEPDIR) h8300/$= (DEPDIR) igen/$(DEPDIR) iq2000/$(DEPDIR) lm32/$(DEPDIR) m32c/$(DEPDIR) m32r= /$(DEPDIR) m68hc11/$(DEPDIR) mcore/$(DEPDIR) microblaze/$(DEPDIR) mips/$(DE= PDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) or1k/$(DEPDIR) ppc= /$(DEPDIR) pru/$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(DEPDIR) sh/$(D= EPDIR) testsuite/common/$(DEPDIR) v850/$(DEPDIR) + -rm -rf aarch64/$(DEPDIR) arm/$(DEPDIR) avr/$(DEPDIR) bfin/$(DEPDIR) bpf/= $(DEPDIR) common/$(DEPDIR) cr16/$(DEPDIR) cris/$(DEPDIR) d10v/$(DEPDIR) erc= 32/$(DEPDIR) example-synacor/$(DEPDIR) frv/$(DEPDIR) ft32/$(DEPDIR) h8300/$= (DEPDIR) igen/$(DEPDIR) iq2000/$(DEPDIR) lm32/$(DEPDIR) m32c/$(DEPDIR) m32r= /$(DEPDIR) m68hc11/$(DEPDIR) mcore/$(DEPDIR) microblaze/$(DEPDIR) mips/$(DE= PDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) or1k/$(DEPDIR) pru= /$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(DEPDIR) sh/$(DEPDIR) testsui= te/common/$(DEPDIR) v850/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-DEJAGNU distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ @@ -4755,7 +4739,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf aarch64/$(DEPDIR) arm/$(DEPDIR) avr/$(DEPDIR) bfin/$(DEPDIR) bpf/= $(DEPDIR) common/$(DEPDIR) cr16/$(DEPDIR) cris/$(DEPDIR) d10v/$(DEPDIR) erc= 32/$(DEPDIR) example-synacor/$(DEPDIR) frv/$(DEPDIR) ft32/$(DEPDIR) h8300/$= (DEPDIR) igen/$(DEPDIR) iq2000/$(DEPDIR) lm32/$(DEPDIR) m32c/$(DEPDIR) m32r= /$(DEPDIR) m68hc11/$(DEPDIR) mcore/$(DEPDIR) microblaze/$(DEPDIR) mips/$(DE= PDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) or1k/$(DEPDIR) ppc= /$(DEPDIR) pru/$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(DEPDIR) sh/$(D= EPDIR) testsuite/common/$(DEPDIR) v850/$(DEPDIR) + -rm -rf aarch64/$(DEPDIR) arm/$(DEPDIR) avr/$(DEPDIR) bfin/$(DEPDIR) bpf/= $(DEPDIR) common/$(DEPDIR) cr16/$(DEPDIR) cris/$(DEPDIR) d10v/$(DEPDIR) erc= 32/$(DEPDIR) example-synacor/$(DEPDIR) frv/$(DEPDIR) ft32/$(DEPDIR) h8300/$= (DEPDIR) igen/$(DEPDIR) iq2000/$(DEPDIR) lm32/$(DEPDIR) m32c/$(DEPDIR) m32r= /$(DEPDIR) m68hc11/$(DEPDIR) mcore/$(DEPDIR) microblaze/$(DEPDIR) mips/$(DE= PDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) or1k/$(DEPDIR) pru= /$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(DEPDIR) sh/$(DEPDIR) testsui= te/common/$(DEPDIR) v850/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic =20 @@ -5692,9 +5676,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_or1k_TRUE@or1k/cgen-cpu-decode: @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_GEN)cpu=3Dor1k32bf mach=3Dor32,or32nd F= LAGS=3D"with-scache" EXTRAFILES=3D"$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)"; $(CG= EN_GEN_CPU_DECODE) @SIM_ENABLE_ARCH_or1k_TRUE@or1k/cpu.h or1k/cpu.c or1k/model.c or1k/sem.c o= r1k/sem-switch.c or1k/decode.c or1k/decode.h: @CGEN_MAINT@ or1k/cgen-cpu-de= code - -@SIM_ENABLE_ARCH_ppc_TRUE@ppc/psim$(EXEEXT): ppc/run$(EXEEXT) -@SIM_ENABLE_ARCH_ppc_TRUE@ $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $= @ 2>/dev/null || cp -p $< $@ @SIM_ENABLE_ARCH_ppc_TRUE@ppc/libsim.a: common/libcommon.a @SIM_ENABLE_ARCH_ppc_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) =20 diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index fca3b4f6b2e..9f55629dfe1 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -21,9 +21,6 @@ %D%/libsim.a \ $(SIM_COMMON_LIBS) =20 -%D%/psim$(EXEEXT): %D%/run$(EXEEXT) - $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< = $@ - ## This makes sure common parts are available before building the arch-sub= dirs ## which will refer to these. SIM_ALL_RECURSIVE_DEPS +=3D common/libcommon.a @@ -34,7 +31,7 @@ SIM_ALL_RECURSIVE_DEPS +=3D common/libcommon.a %D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) =20 -noinst_PROGRAMS +=3D %D%/run %D%/psim +noinst_PROGRAMS +=3D %D%/run =20 %D%/spreg.c: @MAINT@ %D%/ppc-spr-table %D%/spreg-gen.py %D%/$(am__dirstamp) $(AM_V_GEN)$(srcdir)/%D%/spreg-gen.py --source $@.tmp