From: Tsukasa OI <research_trasio@irq.a4lg.com>
To: Tsukasa OI <research_trasio@irq.a4lg.com>,
Anthony Green <green@moxielogic.com>
Cc: gdb-patches@sourceware.org
Subject: [PATCH 1/1] sim/moxie: add custom directory stamp rule
Date: Thu, 8 Sep 2022 11:45:47 +0000 [thread overview]
Message-ID: <c12269a7c8688187577556176dd3d04f9470834b.1662637359.git.research_trasio@irq.a4lg.com> (raw)
In-Reply-To: <cover.1662637359.git.research_trasio@irq.a4lg.com>
Because sim/moxie/moxie-gdb.dtb is neither a program nor a library, automake
does not generate dirstamp file ($builddir/sim/moxie/.dirstamp) for it.
When maintainer mode is enabled, it tries to rebuild sim/moxie/moxie-gdb.dtb
but fails because there's no rules for automake-generated dirstamp file
which moxie-gdb.dtb depends.
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 work
when maintainer mode is enabled).
sim/ChangeLog:
* moxie/local.mk: Add custom rule for the directory stamp.
* Makefile.in: Regenerate.
---
sim/Makefile.in | 23 ++++++++++++++---------
sim/moxie/local.mk | 5 +++++
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/sim/Makefile.in b/sim/Makefile.in
index dbbaa84224a..6d0948cfe2e 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -154,13 +154,14 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \
@SIM_ENABLE_ARCH_m68hc11_TRUE@am__append_29 = $(m68hc11_BUILD_OUTPUTS)
@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_30 = $(mn10300_BUILD_OUTPUTS)
@SIM_ENABLE_ARCH_mn10300_TRUE@am__append_31 = $(mn10300_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_or1k_TRUE@am__append_32 = $(or1k_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_moxie_TRUE@am__append_32 = moxie/$(am__dirstamp)
@SIM_ENABLE_ARCH_or1k_TRUE@am__append_33 = $(or1k_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_34 = $(sh_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_35 = sh/gencode
-@SIM_ENABLE_ARCH_sh_TRUE@am__append_36 = $(sh_BUILD_OUTPUTS)
-@SIM_ENABLE_ARCH_v850_TRUE@am__append_37 = $(v850_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_or1k_TRUE@am__append_34 = $(or1k_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_35 = $(sh_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_36 = sh/gencode
+@SIM_ENABLE_ARCH_sh_TRUE@am__append_37 = $(sh_BUILD_OUTPUTS)
@SIM_ENABLE_ARCH_v850_TRUE@am__append_38 = $(v850_BUILD_OUTPUTS)
+@SIM_ENABLE_ARCH_v850_TRUE@am__append_39 = $(v850_BUILD_OUTPUTS)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -932,13 +933,13 @@ CLEANFILES = 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 =
+DISTCLEANFILES = $(am__append_32)
MOSTLYCLEANFILES = 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 = $(WERROR_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS = -I$(srcroot)/include $(SIM_INLINE) -I$(srcdir)/common
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD)
@@ -947,8 +948,8 @@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a $(am__append_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 = \
$(AM_CPPFLAGS) \
-DSIM_COMMON_BUILD \
@@ -2758,6 +2759,10 @@ 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
+@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 ; @true
@SIM_ENABLE_ARCH_or1k_TRUE@or1k/stamp-mloop: $(srccom)/genmloop.sh or1k/mloop.in
@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \
diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk
index cd57f56ee9a..137e5876f9c 100644
--- a/sim/moxie/local.mk
+++ b/sim/moxie/local.mk
@@ -30,3 +30,8 @@ dtb_DATA = %D%/moxie-gdb.dtb
echo "tree compiler tool (dtc) is missing. Install the tool to "; \
echo "update the device tree blob."; \
fi
+
+%D%/$(am__dirstamp):
+ @$(MKDIR_P) %D%
+ @: >%D%/$(am__dirstamp)
+DISTCLEANFILES += %D%/$(am__dirstamp)
--
2.34.1
next prev parent reply other threads:[~2022-09-08 11:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 11:45 [PATCH 0/1] " Tsukasa OI
2022-09-08 11:45 ` Tsukasa OI [this message]
2022-10-09 3:57 ` [PATCH v2 " Tsukasa OI
2022-10-09 3:57 ` [PATCH v2 1/1] " Tsukasa OI
2022-10-11 10:34 ` Andrew Burgess
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c12269a7c8688187577556176dd3d04f9470834b.1662637359.git.research_trasio@irq.a4lg.com \
--to=research_trasio@irq.a4lg.com \
--cc=gdb-patches@sourceware.org \
--cc=green@moxielogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).