From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/3] sim: unify callback.o building
Date: Sun, 31 Oct 2021 04:55:19 -0400 [thread overview]
Message-ID: <20211031085520.29018-2-vapier@gentoo.org> (raw)
In-Reply-To: <20211031085520.29018-1-vapier@gentoo.org>
Now that the use of TARGET_xxx defines have been removed, we can move
this to the common logic so we only build it once for multi-targets.
---
sim/Makefile.in | 19 +++++++++++++++++++
sim/common/Make-common.in | 3 ++-
sim/common/local.mk | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index e5c3484c047e..4c8305917643 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -229,6 +229,7 @@ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
$(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS)
COMMON_OBJS_NAMES = \
+ callback.o \
portability.o \
sim-load.o \
target-newlib-errno.o \
@@ -237,7 +238,7 @@ COMMON_OBJS_NAMES = \
version.o
COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%)
-LIB_OBJS = callback.o modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS)
+LIB_OBJS = modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS)
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS)
LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/common/local.mk b/sim/common/local.mk
index fdbdca444b3f..2fd78264ba1f 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -34,6 +34,7 @@ noinst_LIBRARIES += %D%/libcommon.a
-I../bfd \
-I..
%C%_libcommon_a_SOURCES = \
+ %D%/callback.c \
%D%/portability.c \
%D%/sim-load.c \
%D%/target-newlib-errno.c \
--
2.33.0
next prev parent reply other threads:[~2021-10-31 8:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 8:55 [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file Mike Frysinger
2021-10-31 8:55 ` Mike Frysinger [this message]
2021-10-31 8:55 ` [PATCH 3/3] sim: drop unused targ-vals.h includes Mike Frysinger
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=20211031085520.29018-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@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: 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).