From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id CE5893858D1E; Sun, 15 Jan 2023 01:52:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE5893858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673747573; bh=8sy1uvwmHdbmmvfoAun7RAzCesfpzYaElj9KzKGAzU4=; h=From:To:Subject:Date:From; b=P6S/rQj41Af8BEAZcdoJD9oDL8UgKTxqCx/Y3S/xCsPhhOUmOsNw7kpyWE3cygLs9 FdoHLb8USVFP0FNr2bGQZWZQVVAqHAE+kfm9rE9E2kyNy7SQwmkBIhEZ8eTGdJxSRP poGiq6OdHSWyK0DWlPgOdZbqbgvkrS2Lorr3IGk4= 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: common: move libcommon.a dep to ppc code X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: ee3134d0288c9d9d4f4a9fe325d4864a556edc63 X-Git-Newrev: 4df74707043bf248f248cd52d9c70c29ec4e679c Message-Id: <20230115015253.CE5893858D1E@sourceware.org> Date: Sun, 15 Jan 2023 01:52:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D4df74707043b= f248f248cd52d9c70c29ec4e679c commit 4df74707043bf248f248cd52d9c70c29ec4e679c Author: Mike Frysinger Date: Mon Jan 2 14:38:01 2023 -0500 sim: common: move libcommon.a dep to ppc code =20 Rather than force this to be built ahead of time for all targets, move the dep to the ppc code since it's the only user of it now. Diff: --- sim/Makefile.in | 53 ++++++++++++++++++++++++++++---------------------= ---- sim/common/local.mk | 5 ----- sim/ppc/local.mk | 6 ++++++ 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 80cfbccb566..a46b8266298 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -287,26 +287,27 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_or1k_TRUE@am__append_91 =3D or1k/run @SIM_ENABLE_ARCH_or1k_TRUE@am__append_92 =3D or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@am__append_93 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_ppc_TRUE@am__append_94 =3D ppc/run ppc/psim -@SIM_ENABLE_ARCH_pru_TRUE@am__append_95 =3D pru/libsim.a -@SIM_ENABLE_ARCH_pru_TRUE@am__append_96 =3D pru/run -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_97 =3D riscv/libsim.a -@SIM_ENABLE_ARCH_riscv_TRUE@am__append_98 =3D riscv/run -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_99 =3D rl78/libsim.a -@SIM_ENABLE_ARCH_rl78_TRUE@am__append_100 =3D rl78/run -@SIM_ENABLE_ARCH_rx_TRUE@am__append_101 =3D rx/libsim.a -@SIM_ENABLE_ARCH_rx_TRUE@am__append_102 =3D rx/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_103 =3D sh/libsim.a -@SIM_ENABLE_ARCH_sh_TRUE@am__append_104 =3D sh/run -@SIM_ENABLE_ARCH_sh_TRUE@am__append_105 =3D \ +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_94 =3D common/libcommon.a +@SIM_ENABLE_ARCH_ppc_TRUE@am__append_95 =3D ppc/run ppc/psim +@SIM_ENABLE_ARCH_pru_TRUE@am__append_96 =3D pru/libsim.a +@SIM_ENABLE_ARCH_pru_TRUE@am__append_97 =3D pru/run +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_98 =3D riscv/libsim.a +@SIM_ENABLE_ARCH_riscv_TRUE@am__append_99 =3D riscv/run +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_100 =3D rl78/libsim.a +@SIM_ENABLE_ARCH_rl78_TRUE@am__append_101 =3D rl78/run +@SIM_ENABLE_ARCH_rx_TRUE@am__append_102 =3D rx/libsim.a +@SIM_ENABLE_ARCH_rx_TRUE@am__append_103 =3D rx/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_104 =3D sh/libsim.a +@SIM_ENABLE_ARCH_sh_TRUE@am__append_105 =3D sh/run +@SIM_ENABLE_ARCH_sh_TRUE@am__append_106 =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_106 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_107 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_108 =3D v850/libsim.a -@SIM_ENABLE_ARCH_v850_TRUE@am__append_109 =3D v850/run -@SIM_ENABLE_ARCH_v850_TRUE@am__append_110 =3D \ +@SIM_ENABLE_ARCH_sh_TRUE@am__append_107 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_108 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_109 =3D v850/libsim.a +@SIM_ENABLE_ARCH_v850_TRUE@am__append_110 =3D v850/run +@SIM_ENABLE_ARCH_v850_TRUE@am__append_111 =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 \ @@ -315,7 +316,7 @@ 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_111 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_112 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -1724,13 +1725,13 @@ noinst_LIBRARIES =3D common/libcommon.a $(am__appen= d_3) $(am__append_6) \ $(am__append_59) $(am__append_63) $(am__append_67) \ $(am__append_69) $(am__append_74) $(am__append_82) \ $(am__append_86) $(am__append_88) $(am__append_90) \ - $(am__append_95) $(am__append_97) $(am__append_99) \ - $(am__append_101) $(am__append_103) $(am__append_108) + $(am__append_96) $(am__append_98) $(am__append_100) \ + $(am__append_102) $(am__append_104) $(am__append_109) BUILT_SOURCES =3D $(am__append_16) $(am__append_20) $(am__append_26) \ $(am__append_30) $(am__append_41) $(am__append_49) \ $(am__append_53) $(am__append_61) $(am__append_76) \ - $(am__append_84) $(am__append_92) $(am__append_105) \ - $(am__append_110) + $(am__append_84) $(am__append_92) $(am__append_106) \ + $(am__append_111) 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 \ @@ -1746,7 +1747,7 @@ MOSTLYCLEANFILES =3D core $(SIM_ENABLED_ARCHES:%=3D%/= *.o) \ $(am__append_42) $(am__append_50) $(am__append_54) \ $(am__append_58) $(am__append_62) $(am__append_66) \ $(am__append_80) $(am__append_85) $(am__append_93) \ - $(am__append_107) $(am__append_111) + $(am__append_108) $(am__append_112) AM_CFLAGS =3D \ $(WERROR_CFLAGS) \ $(WARN_CFLAGS) \ @@ -1761,8 +1762,8 @@ AM_CPPFLAGS_FOR_BUILD =3D -I$(srcroot)/include $(SIM_= HW_CFLAGS) \ $(SIM_INLINE) -I$(srcdir)/common COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_= FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD =3D $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD= ) -o $@ -SIM_ALL_RECURSIVE_DEPS =3D common/libcommon.a \ - $(common_GEN_MODULES_C_TARGETS) +SIM_ALL_RECURSIVE_DEPS =3D $(common_GEN_MODULES_C_TARGETS) \ + $(am__append_94) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_35) SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_36) @@ -5316,6 +5317,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-g= en$(EXEEXT) testsuite/commo =20 @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 @SIM_ENABLE_ARCH_ppc_TRUE@ppc/%.o: ppc/%.c | ppc/libsim.a $(SIM_ALL_RECURS= IVE_DEPS) @SIM_ENABLE_ARCH_ppc_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) diff --git a/sim/common/local.mk b/sim/common/local.mk index cbef45e11e9..f6eee5cc91e 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -23,11 +23,6 @@ AM_CPPFLAGS +=3D \ AM_CPPFLAGS_%C% =3D -DSIM_COMMON_BUILD AM_CPPFLAGS_FOR_BUILD +=3D -I$(srcdir)/%D% =20 -## This makes sure common parts are available before building the arch-sub= dirs -## which will refer to these. -SIM_ALL_RECURSIVE_DEPS +=3D \ - %D%/libcommon.a - ## NB: libcommon.a isn't used directly by ports. We need a target for com= mon ## objects to be a part of, and ports use the individual objects directly. ## We can delete this once ppc/Makefile.in is merged into ppc/local.mk. diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index d8a4cacb152..fca3b4f6b2e 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -24,6 +24,12 @@ %D%/psim$(EXEEXT): %D%/run$(EXEEXT) $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< = $@ =20 +## 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 +%D%/libsim.a: common/libcommon.a + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + ## Helper targets for running make from the top-level due to run's sis.o. %D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)