From patchwork Thu Jan 19 00:35:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 63374 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 0F73C3858C53 for ; Thu, 19 Jan 2023 00:36:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F73C3858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674088576; bh=OfzNM/vjVYw9cA6x0K9MTOqpTa9ZaHlVmY95hHPt6dU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=M4ftWDR+UdjXTtNwR/0OIDg1Y9dPeCmyY/RX6OINPexkQcgy8sJIe2dulriNtwMLs r+5ORRZW5kHQI45TLHswCkzXolB/uoYay0P1iClhGoOBRPBtQuEyj99gOq87pBjHY5 /VAZ8lBapRBurEm+PzdEhDvGgIA6k3TuSP8cxZF8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id B2D1F3858C2C for ; Thu, 19 Jan 2023 00:35:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2D1F3858C2C Received: by smtp.gentoo.org (Postfix, from userid 559) id 532AC33B864; Thu, 19 Jan 2023 00:35:36 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: unify sim-signal.o building Date: Wed, 18 Jan 2023 19:35:34 -0500 Message-Id: <20230119003534.21437-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Now that sim-main.h has been reduced significantly, we can remove it from sim-signal.c and unify it across all boards since it compiles to the same code. --- sim/Makefile.in | 17 +++++++++++------ sim/common/local.mk | 2 +- sim/common/sim-signal.c | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sim/common/local.mk b/sim/common/local.mk index 89843ead03be..5d0992fbd9e6 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -31,6 +31,7 @@ noinst_LIBRARIES += %D%/libcommon.a %D%/callback.c \ %D%/portability.c \ %D%/sim-load.c \ + %D%/sim-signal.c \ %D%/syscall.c \ %D%/target-newlib-errno.c \ %D%/target-newlib-open.c \ @@ -95,7 +96,6 @@ SIM_NEW_COMMON_OBJS = \ sim-profile.o \ sim-reason.o \ sim-reg.o \ - sim-signal.o \ sim-stop.o \ sim-syscall.o \ sim-trace.o \ diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c index 9c4e261fa216..36ebbdfe969e 100644 --- a/sim/common/sim-signal.c +++ b/sim/common/sim-signal.c @@ -22,7 +22,8 @@ along with this program. If not, see . */ #include -#include "sim-main.h" +#include "sim/sim.h" +#include "sim-io.h" #include "sim-signal.h" /* Convert SIM_SIGFOO to SIGFOO.