From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YPDbBZrYzmC6fQAAWB0awg (envelope-from ) for ; Sun, 20 Jun 2021 01:56:42 -0400 Received: by simark.ca (Postfix, from userid 112) id 162AA1F163; Sun, 20 Jun 2021 01:56:42 -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 570EE1E01F for ; Sun, 20 Jun 2021 01:56:41 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 19710385AC1F for ; Sun, 20 Jun 2021 05:56:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19710385AC1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624168601; bh=Uaiqtg7VNPCwlbm8/ThM5fBDAJOl1b6lOviyB3Ju07s=; 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=Q0bpfwS1dqx7i2qIqp1uelkfLT0tB7oDVyAbHZI809rtptxc9Jqs8DYVUzB5byavW ifZwUfdFTKun0aYQkwVk+RzwcBDrvkG9qqw25JolAPgZEX0Xd5UY7W1qNtm4BVB22U v0XRCpjsSIpEl5Lv2gYQ3k8DlBUIoTBY7LyXa0dU= Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id A4BBC385801E for ; Sun, 20 Jun 2021 05:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A4BBC385801E Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id AE24033DF47 for ; Sun, 20 Jun 2021 05:55:23 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 4/5] sim: rx: merge with common configure script Date: Sun, 20 Jun 2021 01:55:18 -0400 Message-Id: <20210620055519.22229-4-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 the unique configure flag to acinclude.m4 so the common code can include it, then delete the rx configure logic entirely. --- sim/Makefile.in | 9 +- sim/configure | 49 +- sim/configure.ac | 5 +- sim/rx/Makefile.in | 2 +- sim/rx/{configure.ac => acinclude.m4} | 19 +- sim/rx/aclocal.m4 | 15 - sim/rx/configure | 2909 ------------------------- 7 files changed, 61 insertions(+), 2947 deletions(-) rename sim/rx/{configure.ac => acinclude.m4} (74%) delete mode 100644 sim/rx/aclocal.m4 delete mode 100755 sim/rx/configure diff --git a/sim/configure.ac b/sim/configure.ac index 5e5273570a5f..8c29a3433e67 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -129,7 +129,7 @@ if test "${enable_sim}" != no; then SIM_TARGET([pru*-*-*], [pru], [true]) SIM_TARGET([riscv*-*-*], [riscv], [false]) SIM_TARGET([rl78-*-*], [rl78], [true]) - SIM_TARGET([rx-*-*], [rx], [false]) + SIM_TARGET([rx-*-*], [rx], [true]) SIM_TARGET([sh*-*-*], [sh], [true]) SIM_TARGET([sparc-*-rtems*|sparc-*-elf*], [erc32], [false]) SIM_TARGET([powerpc*-*-*], [ppc], [false]) @@ -167,5 +167,8 @@ AC_SUBST(sim_scache) AC_SUBST(sim_default_model) AC_SUBST(sim_reserved_bits) +dnl Some arches have unique configure flags. +m4_include([rx/acinclude.m4]) + AC_CONFIG_FILES([arch-subdir.mk Makefile]) AC_OUTPUT diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in index b1023dd2b9cf..5426cc0dd5d7 100644 --- a/sim/rx/Makefile.in +++ b/sim/rx/Makefile.in @@ -20,7 +20,7 @@ ## COMMON_PRE_CONFIG_FRAG -SIM_EXTRA_CFLAGS = @sim_rx_cycle_accurate_flags@ +SIM_EXTRA_CFLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@ SIM_RUN_OBJS = \ main.o \ diff --git a/sim/rx/configure.ac b/sim/rx/acinclude.m4 similarity index 74% rename from sim/rx/configure.ac rename to sim/rx/acinclude.m4 index 2f012f981487..b0df3a71dc9e 100644 --- a/sim/rx/configure.ac +++ b/sim/rx/acinclude.m4 @@ -1,10 +1,5 @@ -dnl Process this file with autoconf to produce a configure script. - -dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. -dnl Contributed by Red Hat, Inc. -dnl -dnl This file is part of the GNU simulators. -dnl +dnl Copyright (C) 1997-2021 Free Software Foundation, Inc. +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 3 of the License, or @@ -18,9 +13,7 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . dnl -AC_INIT(Makefile.in) -AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) - +dnl NB: This file is included in sim/configure, so keep settings namespaced. AC_MSG_CHECKING([whether sim rx should be cycle accurate]) AC_ARG_ENABLE(sim-rx-cycle-accurate, [AS_HELP_STRING([--disable-sim-rx-cycle-accurate], @@ -30,11 +23,9 @@ yes | no) ;; *) AC_MSG_ERROR(bad value ${enableval} given for --enable-sim-rx-cycle-accurate option) ;; esac]) if test "x${enable_sim_rx_cycle_accurate}" != xno; then - sim_rx_cycle_accurate_flags="-DCYCLE_ACCURATE" + SIM_RX_CYCLE_ACCURATE_FLAGS="-DCYCLE_ACCURATE" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi -AC_SUBST(sim_rx_cycle_accurate_flags) - -SIM_AC_OUTPUT +AC_SUBST(SIM_RX_CYCLE_ACCURATE_FLAGS) -- 2.31.1