From patchwork Wed Jan 3 06:21:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 83194 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 537E1385C6EE for ; Wed, 3 Jan 2024 06:22:07 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 2DF173858C2C for ; Wed, 3 Jan 2024 06:21:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DF173858C2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2DF173858C2C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704262896; cv=none; b=i4ZGjqKE+KctGO5xLNdRhRjLsi0OL7oT/f3QawGAJ9K0TLA2Y2CfjeUIMuBaTbWe1DZKfhZ5C14MK6WeUVfEDdo6i5C6O7oue5MPn4O13URN0WXl9t6EYraSIu0KXWKZ8aLq4xyPSrwtiRUGHXlkgQMwJwLklast28z/wQXxiUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704262896; c=relaxed/simple; bh=Ju13pSse1LYo0P2LDT0k/aOFrR4g0kV57YXrkTrlPdk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tIW7cmL8Kzt2L/zT3OcUdTVXZl5abdUwhsONSBarnDZVEAD+cxIghhURnbbx+LBS99d/95bH+sJb3PcJTdlEc17Sz9lCctZXKEmVY1gBmJWxwGipjKRM9psbXl0zLW5qD3WPPTAXLOl4mc18oxyDcM4SHtWirElFjb9XbEcgrq0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 6B03C34076D; Wed, 3 Jan 2024 06:21:34 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed 1/5] sim: ppc: move main.o compilation to top-level Date: Wed, 3 Jan 2024 01:21:28 -0500 Message-ID: <20240103062132.24338-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org --- sim/Makefile.in | 27 +++++++++++++++++++-------- sim/ppc/Makefile.in | 9 +-------- sim/ppc/local.mk | 19 +++++++++++++------ 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 68be55597497..7841e75d4ce8 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -100,7 +100,7 @@ BFD_LIB = ../../bfd/libbfd.la TARGETLIB = libsim.a -all: main.o $(TARGETLIB) $(GDB_OBJ) +all: $(TARGETLIB) $(GDB_OBJ) .c.o: $(ECHO_CC) $(CC) -c $(STD_CFLAGS) $< @@ -388,11 +388,6 @@ LIB_SRC = \ $(HW_SRC) \ $(LIB_INLINE_SRC) -MAIN_SRC = \ - main.c \ - gdb-sim.c \ - sim_calls.c - COMMON_OBJS_NAMES = \ callback.o \ target-newlib-errno.o \ @@ -495,8 +490,6 @@ gdb-sim.o: gdb-sim.c $(PSIM_H) $(OPTIONS_H) $(REGISTERS_H) $(GDB_REMOTE_SIM_H) spreg.o: spreg.c $(BASICS_H) $(SPREG_H) -main.o: main.c $(PSIM_H) $(OPTIONS_H) $(DEVICE_H) $(EVENTS_H) $(BFD_H) $(GDB_CALLBACK_H) $(GDB_REMOTE_SIM_H) - device.o: device.c $(DEVICE_TABLE_H) $(CAP_H) $(EVENTS_H) $(PSIM_H) tree.o: tree.c $(BASICS_H) $(DEVICE_H) $(TREE_H) diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index 155d83a9470a..3c36b60df5a4 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -15,9 +15,20 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -%C%_run_SOURCES = +AM_CPPFLAGS_%C% = \ + -DHAVE_COMMON_FPU \ + $(sim_ppc_smp) \ + $(sim_ppc_xor_endian) \ + $(sim_ppc_bitsize) \ + $(sim_ppc_timebase) \ + $(sim_ppc_float) \ + $(sim_ppc_monitor) \ + $(sim_ppc_model) $(sim_ppc_default_model) $(sim_ppc_model_issue) \ + $(sim_ppc_switch) + +%C%_run_SOURCES = \ + %D%/main.c %C%_run_LDADD = \ - %D%/main.o \ %D%/libsim.a \ $(SIM_COMMON_LIBS) @@ -27,10 +38,6 @@ SIM_ALL_RECURSIVE_DEPS += common/libcommon.a %D%/libsim.a: common/libcommon.a $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -## Helper targets for running make from the top-level due to run's sis.o. -%D%/main.o: %D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) - $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - noinst_PROGRAMS += %D%/run SIM_ALL_RECURSIVE_DEPS += %D%/defines.h