From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1ABAB3858407 for ; Sun, 31 Oct 2021 08:55:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1ABAB3858407 Received: by smtp.gentoo.org (Postfix, from userid 559) id 84229343427; Sun, 31 Oct 2021 08:55:21 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/3] sim: unify callback.o building Date: Sun, 31 Oct 2021 04:55:19 -0400 Message-Id: <20211031085520.29018-2-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211031085520.29018-1-vapier@gentoo.org> References: <20211031085520.29018-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2021 08:55:23 -0000 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