From patchwork Sat Nov 5 03:50:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59981 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 7561E3858426 for ; Sat, 5 Nov 2022 03:51:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7561E3858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667620275; bh=wrplXZhcZJYyL8imB5UtKr/axgh4CeZUC7QMbzNlWC0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jyqY+2EGYYJW3gnbxU/ASKx/TJsEpY6UMyxMEFZLE63VP3dAVULBL/3PWFYnJDMLK ThmRU4Ew5yvlG4WGxIthbcFdQD2bO72vbf3q/u6zC4eUzCcaNuz/X7DPXUjkKl2AnL Clxb2v7+92ogLGwgT053ekBcvRrDTdhyvjwHi2gg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 8E4F23858C2B for ; Sat, 5 Nov 2022 03:50:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E4F23858C2B Received: by smtp.gentoo.org (Postfix, from userid 559) id 37682340CEE; Sat, 5 Nov 2022 03:50:51 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 1/3] sim: adjust sim_hw options style Date: Sat, 5 Nov 2022 10:50:45 +0700 Message-Id: <20221105035047.11654-1-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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" We use uppercase for other variables, and are already turning it to uppercase in the arch-subdir.mk, so convert it in the configure step. --- sim/Makefile.in | 4 ++-- sim/arch-subdir.mk.in | 4 ++-- sim/configure | 6 ++++-- sim/m4/sim_ac_option_hardware.m4 | 6 ++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 616e06ec453f..cbe3fca88654 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -77,7 +77,7 @@ CGENDIR = @cgendir@ SIM_INLINE = @SIM_INLINE@ -SIM_HW_CFLAGS = @sim_hw_cflags@ -SIM_HW_SOCKSER = @sim_hw_sockser@ +SIM_HW_CFLAGS = @SIM_HW_CFLAGS@ +SIM_HW_SOCKSER = @SIM_HW_SOCKSER@ SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) @SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4 index d1acc6a7403d..5216d6ba5545 100644 --- a/sim/m4/sim_ac_option_hardware.m4 +++ b/sim/m4/sim_ac_option_hardware.m4 @@ -36,6 +36,8 @@ else fi AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"]) AC_MSG_RESULT(${enable_sim_hardware}) -AC_SUBST(sim_hw_cflags) -AC_SUBST(sim_hw_sockser) +SIM_HW_CFLAGS=$sim_hw_cflags +AC_SUBST(SIM_HW_CFLAGS) +SIM_HW_SOCKSER=$sim_hw_sockser +AC_SUBST(SIM_HW_SOCKSER) ]) From patchwork Sat Nov 5 03:50:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59982 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 44DB93858403 for ; Sat, 5 Nov 2022 03:51:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44DB93858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667620303; bh=MrX1V/QRwRPiCAtrEg8mDAa+ujX50HU0AFkCrzcWFFQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=jawSA0JLMny60PINte880o8X7DJKECYpVSpRqmA0QR/UNdeBPqTwrIY5s4pBgVE73 ucce+RQr1bGFP27yIHnagV9b5RV+V2dBK6LDH8iJ/77XQ14z0ekNBoKVWd1pYM6jBC ZvkbDwr/LloGzju58051tuJOhiju60jID12bvAW8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id C32BE3858403 for ; Sat, 5 Nov 2022 03:50:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C32BE3858403 Received: by smtp.gentoo.org (Postfix, from userid 559) id 4DD1A340E47; Sat, 5 Nov 2022 03:50:53 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 2/3] sim: drop unused SIM_HARDWARE variable Date: Sat, 5 Nov 2022 10:50:46 +0700 Message-Id: <20221105035047.11654-2-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221105035047.11654-1-vapier@gentoo.org> References: <20221105035047.11654-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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" This hasn't been used since the refactor way back in commit f872d0d643968c1101bb8c07b252edd54f626da2 ("Only enable H/W on some mips targets."), so punt it. --- sim/common/Make-common.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 2698f7b2b673..18dcd36a72bb 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -186,8 +186,7 @@ CONFIG_CFLAGS = \ $(SIM_HW_CFLAGS) \ $(SIM_INLINE) \ $(SIM_WARN_CFLAGS) \ - $(SIM_WERROR_CFLAGS) \ - $(SIM_HARDWARE) + $(SIM_WERROR_CFLAGS) CSEARCH = -I. -I$(srcdir) -I$(srccom) \ -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ From patchwork Sat Nov 5 03:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 59983 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 1CC4E3858416 for ; Sat, 5 Nov 2022 03:52:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CC4E3858416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667620354; bh=8OCIP5mzOdwjcKx6OzuxgcgztNLzywQ68S0sQ245y0w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=WMuhkN+veSu8s1+vqaiaLqxMSTEt9eg+7O31XpM5TSEwoemE25Tlb6f9BqoaY+yTl U70e3asZS8JNm2SVl4MtRGQ0fNFSbxhWgxUFactt3ppeJdIzJkeKTJkekrj65nE9ld Xncsr/dR5PVfVOg+TY+MfRyfvdsZVllhgfkYNzSw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id CA235385843A for ; Sat, 5 Nov 2022 03:50:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA235385843A Received: by smtp.gentoo.org (Postfix, from userid 559) id 6B970340CEE; Sat, 5 Nov 2022 03:50:55 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 3/3] sim: build: add SIM_HW_CFLAGS to top-level build too Date: Sat, 5 Nov 2022 10:50:47 +0700 Message-Id: <20221105035047.11654-3-vapier@gentoo.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221105035047.11654-1-vapier@gentoo.org> References: <20221105035047.11654-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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" This matches what we do with targets already. --- sim/Makefile.am | 2 ++ sim/Makefile.in | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index d8730f276988..7ea013ac1965 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -46,10 +46,12 @@ AM_CPPFLAGS = \ -I$(srcroot)/include \ -I../bfd \ -I.. \ + $(SIM_HW_CFLAGS) \ $(SIM_INLINE) AM_CPPFLAGS_FOR_BUILD = \ -I$(srcroot)/include \ + $(SIM_HW_CFLAGS) \ $(SIM_INLINE) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@