From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 625423858D32; Sun, 15 Jan 2023 01:45:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 625423858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673747140; bh=tmRI5S1wIyYUznqDsRHrnhb/+JakMj3BWZ5l+G/fcGY=; h=From:To:Subject:Date:From; b=sb2xEhDLr7SnO/6Ll3YU3VV6SQPB+3xpXv1JlnfqgiDIzhF/BM+QZcYnl32XBR9tR LPaxLV9eoNmx2BQi+G1YexqA1xnflz/yHx0jus2+VpZ5bcX/v9E30VDnV5YcHsxW9Z GAoJKVgwGwt5eSaZJMcUNrqR9yo5JLtLavhN7E3o= 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: simplify hw-config.h deps X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 068b723abc3f642f2fa5408908049d3d21a98588 X-Git-Newrev: 49444feaefc9ec5a64e5c9a0ce54923f50473013 Message-Id: <20230115014540.625423858D32@sourceware.org> Date: Sun, 15 Jan 2023 01:45:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D49444feaefc9= ec5a64e5c9a0ce54923f50473013 commit 49444feaefc9ec5a64e5c9a0ce54923f50473013 Author: Mike Frysinger Date: Mon Jan 2 00:06:34 2023 -0500 sim: common: simplify hw-config.h deps =20 Now that all ports (other than ppc) build in the top-level, we don't need to expand all the hw-config.h targets as a recursive dep. Each port depends on their respective header now, and the ppc port doesn't use it at all. Diff: --- sim/Makefile.in | 18 ++++++++---------- sim/common/local.mk | 4 +--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index c2669fd1505..24ad2915ac4 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1761,8 +1761,8 @@ CLEANFILES =3D common/version.c common/version.c-stam= p \ testsuite/common/bits64m63.c DISTCLEANFILES =3D $(am__append_93) MOSTLYCLEANFILES =3D core $(SIM_ENABLED_ARCHES:%=3D%/*.o) \ - $(common_HW_CONFIG_H_TARGETS) $(patsubst \ - %,%/stamp-hw,$(SIM_ENABLED_ARCHES)) \ + $(SIM_ENABLED_ARCHES:%=3D%/hw-config.h) \ + $(SIM_ENABLED_ARCHES:%=3D%/stamp-hw) \ $(common_GEN_MODULES_C_TARGETS) $(patsubst \ %,%/stamp-modules,$(SIM_ENABLED_ARCHES)) $(am__append_6) \ site-sim-config.exp testrun.log testrun.sum $(am__append_19) \ @@ -1786,13 +1786,12 @@ AM_CPPFLAGS_FOR_BUILD =3D -I$(srcroot)/include $(SI= M_HW_CFLAGS) \ 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_HW_CONFIG_H_TARGETS) $(common_GEN_MODULES_C_TARGETS) \ - $(am__append_3) $(am__append_18) $(am__append_23) \ - $(am__append_30) $(am__append_35) $(am__append_47) \ - $(am__append_56) $(am__append_61) $(am__append_65) \ - $(am__append_71) $(am__append_75) $(am__append_91) \ - $(am__append_97) $(am__append_106) $(am__append_120) \ - $(am__append_126) + $(common_GEN_MODULES_C_TARGETS) $(am__append_3) \ + $(am__append_18) $(am__append_23) $(am__append_30) \ + $(am__append_35) $(am__append_47) $(am__append_56) \ + $(am__append_61) $(am__append_65) $(am__append_71) \ + $(am__append_75) $(am__append_91) $(am__append_97) \ + $(am__append_106) $(am__append_120) $(am__append_126) SIM_INSTALL_DATA_LOCAL_DEPS =3D=20 SIM_INSTALL_EXEC_LOCAL_DEPS =3D $(am__append_40) SIM_UNINSTALL_LOCAL_DEPS =3D $(am__append_41) @@ -1833,7 +1832,6 @@ SIM_NEW_COMMON_OBJS =3D sim-arange.o sim-bits.o sim-c= lose.o \ sim-signal.o sim-stop.o sim-syscall.o sim-trace.o sim-utils.o \ sim-watch.o $(am__append_2) SIM_HW_DEVICES =3D cfi core pal glue -common_HW_CONFIG_H_TARGETS =3D $(patsubst %,%/hw-config.h,$(SIM_ENABLED_AR= CHES)) am_arch_d =3D $(subst -,_,$(@D)) GEN_MODULES_C_SRCS =3D \ $(wildcard \ diff --git a/sim/common/local.mk b/sim/common/local.mk index 2c68f668d37..0ce79014973 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -131,9 +131,7 @@ endif touch $@ .PRECIOUS: %/stamp-hw =20 -%C%_HW_CONFIG_H_TARGETS =3D $(patsubst %,%/hw-config.h,$(SIM_ENABLED_ARCHE= S)) -MOSTLYCLEANFILES +=3D $(%C%_HW_CONFIG_H_TARGETS) $(patsubst %,%/stamp-hw,$= (SIM_ENABLED_ARCHES)) -SIM_ALL_RECURSIVE_DEPS +=3D $(%C%_HW_CONFIG_H_TARGETS) +MOSTLYCLEANFILES +=3D $(SIM_ENABLED_ARCHES:%=3D%/hw-config.h) $(SIM_ENABLE= D_ARCHES:%=3D%/stamp-hw) =20 ## See sim_pre_argv_init and sim_module_install in sim-module.c for more d= etails. ## TODO: Switch this to xxx_SOURCES once projects build objects in local.m= k.