public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: common: move test-hw-events to top-level build Date: Tue, 10 Jan 2023 06:28:25 +0000 (GMT) [thread overview] Message-ID: <20230110062825.269A53858413@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b014c9b0872a05ec9fc3c63e712b4208654241af commit b014c9b0872a05ec9fc3c63e712b4208654241af Author: Mike Frysinger <vapier@gentoo.org> Date: Sun Jan 1 19:03:28 2023 -0500 sim: common: move test-hw-events to top-level build This is an internal developer target that isn't normally compiled, but it can still be occasionally useful. Move it to the top-level build so we can kill off common/Make-common.in. Diff: --- sim/Makefile.in | 6 ++++++ sim/common/Make-common.in | 5 ----- sim/common/hw-events.c | 2 ++ sim/common/local.mk | 9 +++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 099bfd56b98..c13239058bc 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -4585,6 +4585,12 @@ common/version.c-stamp: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(src $(AM_V_at)$(SHELL) $(srcroot)/move-if-change $@.tmp $(@:-stamp=) $(AM_V_at)touch $@ +.PRECIOUS: %/test-hw-events.o +%/test-hw-events.o: common/hw-events.c + $(AM_V_CC)$(COMPILE) -DMAIN -c -o $@ $< +%/test-hw-events: %/test-hw-events.o %/libsim.a + $(AM_V_CCLD)$(LINK) -o $@ $^ $(SIM_COMMON_LIBS) $(LIBS) + # FIXME This is one very simple-minded way of generating the file hw-config.h. %/hw-config.h: %/stamp-hw ; @true %/stamp-hw: Makefile diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 15242c61264..a081525c91c 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -154,11 +154,6 @@ override COMPILE.pre = source='$<' object='$@' libtool=no \ override POSTCOMPILE = endif -test-hw-events: $(srccom)/hw-events.c libsim.a - $(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \ - $(CC) $(ALL_CFLAGS) -DMAIN -o test-hw-events$(EXEEXT) \ - $(srccom)/hw-events.c libsim.a $(EXTRA_LIBS) - # Support targets. install: diff --git a/sim/common/hw-events.c b/sim/common/hw-events.c index 99e2f1a7fd8..fc579a85706 100644 --- a/sim/common/hw-events.c +++ b/sim/common/hw-events.c @@ -23,6 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdarg.h> #include <string.h> +#include "sim/callback.h" + #include "hw-main.h" #include "hw-base.h" diff --git a/sim/common/local.mk b/sim/common/local.mk index 32b5db6a6ee..f79a3011374 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -52,6 +52,15 @@ noinst_LIBRARIES += %D%/libcommon.a CLEANFILES += \ %D%/version.c %D%/version.c-stamp +## NB: This is a bit of a hack. If we can generalize the common/ files, we can +## turn this from an arch-specific %/test-hw-events into a common/test-hw-events +## program. +.PRECIOUS: %/test-hw-events.o +%/test-hw-events.o: common/hw-events.c + $(AM_V_CC)$(COMPILE) -DMAIN -c -o $@ $< +%/test-hw-events: %/test-hw-events.o %/libsim.a + $(AM_V_CCLD)$(LINK) -o $@ $^ $(SIM_COMMON_LIBS) $(LIBS) + ## ## For subdirs. ##
reply other threads:[~2023-01-10 6:28 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230110062825.269A53858413@sourceware.org \ --to=vapier@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /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: linkBe 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).