From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SDzzFLbYzmC6fQAAWB0awg (envelope-from ) for ; Sun, 20 Jun 2021 01:57:10 -0400 Received: by simark.ca (Postfix, from userid 112) id 53D971F163; Sun, 20 Jun 2021 01:57:10 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8446E1E01F for ; Sun, 20 Jun 2021 01:57:09 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 45A2E3857C71 for ; Sun, 20 Jun 2021 05:57:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45A2E3857C71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624168629; bh=CoS3iolzQMu770xAlOIbFX4wDGhm6lcYF1qDO8q3wtk=; 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=UjQG7AqycY9G8JRLKYaKR1U2jjEsHoIRrPm9NaN9tFRcTjNDwjt2SNGVbw+MG7y8Q baE6+87QdjgCTz9iWzn17WO87mO0PMU+8e0gcSzpcKmLr/Fw5SpDj6xNPmTqVb+C0q PUihuP92kIeHBTV5tbaxFHQbTN5pk74dYjjMym7s= Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id A7F613858022 for ; Sun, 20 Jun 2021 05:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7F613858022 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id A94EC33D7E3 for ; Sun, 20 Jun 2021 05:55:22 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 2/5] sim: unify hardware settings Date: Sun, 20 Jun 2021 01:55:16 -0400 Message-Id: <20210620055519.22229-2-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210620055519.22229-1-vapier@gentoo.org> References: <20210620055519.22229-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Move these options up to the common dir so we only test & export them once across all ports. --- sim/Makefile.in | 3 ++ sim/aarch64/aclocal.m4 | 1 - sim/aarch64/configure | 53 ------------------------------- sim/aclocal.m4 | 1 + sim/arch-subdir.mk.in | 5 +++ sim/arm/aclocal.m4 | 1 - sim/arm/configure | 53 ------------------------------- sim/avr/aclocal.m4 | 1 - sim/avr/configure | 53 ------------------------------- sim/bfin/aclocal.m4 | 1 - sim/bfin/configure | 48 ---------------------------- sim/bpf/aclocal.m4 | 1 - sim/bpf/configure | 48 ---------------------------- sim/common/Make-common.in | 4 --- sim/configure | 54 ++++++++++++++++++++++++++++++-- sim/configure.ac | 1 + sim/cr16/aclocal.m4 | 1 - sim/cr16/configure | 53 ------------------------------- sim/cris/aclocal.m4 | 1 - sim/cris/configure | 48 ---------------------------- sim/d10v/aclocal.m4 | 1 - sim/d10v/configure | 53 ------------------------------- sim/erc32/aclocal.m4 | 1 - sim/erc32/configure | 53 ------------------------------- sim/example-synacor/aclocal.m4 | 1 - sim/example-synacor/configure | 53 ------------------------------- sim/frv/aclocal.m4 | 1 - sim/frv/configure | 48 ---------------------------- sim/ft32/aclocal.m4 | 1 - sim/ft32/configure | 53 ------------------------------- sim/h8300/aclocal.m4 | 1 - sim/h8300/configure | 53 ------------------------------- sim/iq2000/aclocal.m4 | 1 - sim/iq2000/configure | 48 ---------------------------- sim/lm32/aclocal.m4 | 1 - sim/lm32/configure | 48 ---------------------------- sim/m32c/aclocal.m4 | 1 - sim/m32c/configure | 53 ------------------------------- sim/m32r/aclocal.m4 | 1 - sim/m32r/configure | 48 ---------------------------- sim/m4/sim_ac_option_hardware.m4 | 11 +------ sim/m4/sim_ac_output.m4 | 2 -- sim/m68hc11/aclocal.m4 | 1 - sim/m68hc11/configure | 53 ------------------------------- sim/mcore/aclocal.m4 | 1 - sim/mcore/configure | 53 ------------------------------- sim/microblaze/aclocal.m4 | 1 - sim/microblaze/configure | 53 ------------------------------- sim/mips/aclocal.m4 | 1 - sim/mips/configure | 48 ---------------------------- sim/mn10300/aclocal.m4 | 1 - sim/mn10300/configure | 48 ---------------------------- sim/moxie/aclocal.m4 | 1 - sim/moxie/configure | 53 ------------------------------- sim/msp430/aclocal.m4 | 1 - sim/msp430/configure | 53 ------------------------------- sim/or1k/aclocal.m4 | 1 - sim/or1k/configure | 48 ---------------------------- sim/pru/aclocal.m4 | 1 - sim/pru/configure | 53 ------------------------------- sim/riscv/aclocal.m4 | 1 - sim/riscv/configure | 48 ---------------------------- sim/rl78/aclocal.m4 | 1 - sim/rl78/configure | 53 ------------------------------- sim/rx/aclocal.m4 | 1 - sim/rx/configure | 48 ---------------------------- sim/sh/aclocal.m4 | 1 - sim/sh/configure | 53 ------------------------------- sim/v850/aclocal.m4 | 1 - sim/v850/configure | 48 ---------------------------- 70 files changed, 63 insertions(+), 1627 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 92b217d20be6..f145f1a3c6bd 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -68,3 +68,8 @@ CGEN_MAINT = ; @true CGENDIR = @cgendir@ SIM_INLINE = @SIM_INLINE@ + +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/common/Make-common.in b/sim/common/Make-common.in index 6d7c9c47b64a..41becaa05f16 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -72,8 +72,6 @@ SHELL = @SHELL@ SIM_BITSIZE = @sim_bitsize@ SIM_DEFAULT_MODEL = @sim_default_model@ SIM_FLOAT = @sim_float@ -SIM_HW_CFLAGS = @sim_hw_cflags@ -SIM_HW_SOCKSER = @sim_hw_sockser@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) @@ -216,8 +214,6 @@ BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) -SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) -@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a diff --git a/sim/configure.ac b/sim/configure.ac index 9530268ddc59..042bfbfd1cd3 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -122,6 +122,7 @@ SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_DEBUG SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ENVIRONMENT +SIM_AC_OPTION_HARDWARE SIM_AC_OPTION_INLINE SIM_AC_OPTION_PROFILE SIM_AC_OPTION_STDIO diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4 index 14101830e828..ed53cd2f1206 100644 --- a/sim/m4/sim_ac_option_hardware.m4 +++ b/sim/m4/sim_ac_option_hardware.m4 @@ -39,16 +39,7 @@ elif test "$enable_sim_hardware" = yes; then else AC_MSG_ERROR([unknown argument "$enable_sim_hardware"]) fi -dnl AM_CONDITIONAL([SIM_ENABLE_HW], [test "$enable_sim_hardware" = "yes"]) -if test "$enable_sim_hardware" = "yes"; then - SIM_ENABLE_HW_TRUE= - SIM_ENABLE_HW_FALSE='#' -else - SIM_ENABLE_HW_TRUE='#' - SIM_ENABLE_HW_FALSE= -fi -AC_SUBST(SIM_ENABLE_HW_TRUE) -AC_SUBST(SIM_ENABLE_HW_FALSE) +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) diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4 index 8d260421e0e9..aba45b0bc33e 100644 --- a/sim/m4/sim_ac_output.m4 +++ b/sim/m4/sim_ac_output.m4 @@ -21,8 +21,6 @@ dnl one afterwards. The two pieces of the common fragment are inserted into dnl the target's fragment at the appropriate points. AC_DEFUN([SIM_AC_OUTPUT], [dnl -AC_REQUIRE([SIM_AC_OPTION_HARDWARE])dnl - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then -- 2.31.1