From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id 93ED83858D3C; Tue, 11 Oct 2022 10:33:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93ED83858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665484426; bh=UTEZ4D+qzhVaeZ+cdPmk9zZKVYH0f6SqQX4rYM7LJKM=; h=From:To:Subject:Date:From; b=mDInN2wA0csgpvjd6/6RXDO5XkDn+ojPuS0+9jk5dIqYQjY/z44h2RLbIu+7Moq5e cPm42S7tu6zsNHwMVFXkUhbDc2WGJSiW6sPUALGS7BydToajxaeFjsPsEZCW+kP0GQ 5YSNWgy/Xkl77DbP/k4rkys8MsFT1rKn5iGASk2s= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim/moxie: add custom directory stamp rule X-Act-Checkin: binutils-gdb X-Git-Author: Tsukasa OI X-Git-Refname: refs/heads/master X-Git-Oldrev: 73fa80feee65dde8cbbdacca1b76b4f3f6af62cb X-Git-Newrev: d2d69057a2c2d2e51d4b5ea27fea2e1e65a83592 Message-Id: <20221011103346.93ED83858D3C@sourceware.org> Date: Tue, 11 Oct 2022 10:33:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dd2d69057a2c2= d2e51d4b5ea27fea2e1e65a83592 commit d2d69057a2c2d2e51d4b5ea27fea2e1e65a83592 Author: Tsukasa OI Date: Sun Oct 9 03:57:12 2022 +0000 sim/moxie: add custom directory stamp rule =20 Because sim/moxie/moxie-gdb.dtb is neither a program nor a library, aut= omake does not generate dirstamp file ($builddir/sim/moxie/.dirstamp) for it. =20 When maintainer mode is enabled, it tries to rebuild sim/moxie/moxie-gd= b.dtb but fails because there's no rules for automake-generated dirstamp file which moxie-gdb.dtb depends. =20 This commit adds its own rule for the directory stamp (modified copy of= the automake output) and adds the directory stamp file to DISTCLEANFILES to mimic automake-generated behavior (although "make distclean" does not w= ork when maintainer mode is enabled). Diff: --- sim/Makefile.in | 25 ++++++++++++++++--------- sim/moxie/local.mk | 7 +++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 3278febc5e8..7845a333fca 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -154,13 +154,14 @@ TESTS =3D testsuite/common/bits32m0$(EXEEXT) \ @SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_29 =3D $(m68hc11_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_30 =3D $(mn10300_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@am__append_31 =3D $(mn10300_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_or1k_TRUE@am__append_32 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_moxie_TRUE@am__append_32 =3D moxie/$(am__dirstamp) @SIM_ENABLE_ARCH_or1k_TRUE@am__append_33 =3D $(or1k_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_34 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_sh_TRUE@am__append_35 =3D sh/gencode -@SIM_ENABLE_ARCH_sh_TRUE@am__append_36 =3D $(sh_BUILD_OUTPUTS) -@SIM_ENABLE_ARCH_v850_TRUE@am__append_37 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_or1k_TRUE@am__append_34 =3D $(or1k_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_35 =3D $(sh_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_sh_TRUE@am__append_36 =3D sh/gencode +@SIM_ENABLE_ARCH_sh_TRUE@am__append_37 =3D $(sh_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@am__append_38 =3D $(v850_BUILD_OUTPUTS) +@SIM_ENABLE_ARCH_v850_TRUE@am__append_39 =3D $(v850_BUILD_OUTPUTS) subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/acx.m4 \ @@ -935,13 +936,13 @@ CLEANFILES =3D common/version.c common/version.c-stam= p \ testsuite/common/bits-gen testsuite/common/bits32m0.c \ testsuite/common/bits32m31.c testsuite/common/bits64m0.c \ testsuite/common/bits64m63.c -DISTCLEANFILES =3D=20 +DISTCLEANFILES =3D $(am__append_32) MOSTLYCLEANFILES =3D core $(am__append_5) site-sim-config.exp \ testrun.log testrun.sum $(am__append_7) $(am__append_10) \ $(am__append_12) $(am__append_15) $(am__append_17) \ $(am__append_19) $(am__append_21) $(am__append_24) \ $(am__append_26) $(am__append_29) $(am__append_31) \ - $(am__append_33) $(am__append_36) $(am__append_38) + $(am__append_34) $(am__append_37) $(am__append_39) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D -I$(srcroot)/include $(SIM_INLINE) -I$(srcdir)/common COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD) @@ -950,8 +951,8 @@ SIM_ALL_RECURSIVE_DEPS =3D common/libcommon.a $(am__app= end_2) \ $(am__append_6) $(am__append_8) $(am__append_11) \ $(am__append_13) $(am__append_16) $(am__append_18) \ $(am__append_20) $(am__append_22) $(am__append_25) \ - $(am__append_27) $(am__append_30) $(am__append_32) \ - $(am__append_34) $(am__append_37) + $(am__append_27) $(am__append_30) $(am__append_33) \ + $(am__append_35) $(am__append_38) common_libcommon_a_CPPFLAGS =3D \ $(AM_CPPFLAGS) \ -DSIM_COMMON_BUILD \ @@ -2761,6 +2762,12 @@ testsuite/common/bits64m63.c: testsuite/common/bits-= gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_moxie_TRUE@ echo "update the device tree blob."; \ @SIM_ENABLE_ARCH_moxie_TRUE@ fi =20 +# Rule to create the .dirstamp file (on which moxie-gdb.dtb depends) +# as automake fails to automatically create this rule for _DATA items. +@SIM_ENABLE_ARCH_moxie_TRUE@moxie/$(am__dirstamp): +@SIM_ENABLE_ARCH_moxie_TRUE@ @$(MKDIR_P) moxie +@SIM_ENABLE_ARCH_moxie_TRUE@ @: >moxie/$(am__dirstamp) + @SIM_ENABLE_ARCH_or1k_TRUE@or1k/mloop.c or1k/eng.h: or1k/stamp-mloop ; @tr= ue @SIM_ENABLE_ARCH_or1k_TRUE@or1k/stamp-mloop: $(srccom)/genmloop.sh or1k/ml= oop.in @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -she= ll $(SHELL) \ diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk index cd57f56ee9a..600d2640bec 100644 --- a/sim/moxie/local.mk +++ b/sim/moxie/local.mk @@ -30,3 +30,10 @@ dtb_DATA =3D %D%/moxie-gdb.dtb echo "tree compiler tool (dtc) is missing. Install the tool to "; \ echo "update the device tree blob."; \ fi + +# Rule to create the .dirstamp file (on which moxie-gdb.dtb depends) +# as automake fails to automatically create this rule for _DATA items. +%D%/$(am__dirstamp): + @$(MKDIR_P) %D% + @: >%D%/$(am__dirstamp) +DISTCLEANFILES +=3D %D%/$(am__dirstamp)