From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 630AF384840A for ; Sun, 20 Jun 2021 02:30:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 630AF384840A Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 8D9CA33FE74 for ; Sun, 20 Jun 2021 02:30:38 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: unify dtc tool checks Date: Sat, 19 Jun 2021 22:30:37 -0400 Message-Id: <20210620023037.22676-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Sun, 20 Jun 2021 02:30:40 -0000 Only one arch uses this currently, but others could too. By moving it up to the common checks, it'll also let us simplify the moxie code significantly. --- sim/Makefile.in | 1 + sim/arch-subdir.mk.in | 1 + sim/configure | 98 +++++++++++++++++++++++++++++++++++++- sim/m4/sim_ac_toolchain.m4 | 2 + sim/moxie/Makefile.in | 2 - sim/moxie/configure | 94 ------------------------------------ sim/moxie/configure.ac | 2 - 7 files changed, 100 insertions(+), 100 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 8128a27971d7..5f59f8808073 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -39,6 +39,7 @@ LDFLAGS = @LDFLAGS@ AR = @AR@ AR_FLAGS = rc RANLIB = @RANLIB@ +DTC = @DTC@ DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ diff --git a/sim/m4/sim_ac_toolchain.m4 b/sim/m4/sim_ac_toolchain.m4 index 2f1a42868ca9..47b992880f07 100644 --- a/sim/m4/sim_ac_toolchain.m4 +++ b/sim/m4/sim_ac_toolchain.m4 @@ -24,6 +24,8 @@ AC_C_BIGENDIAN AC_ARG_PROGRAM AC_PROG_INSTALL +AC_CHECK_TOOL(DTC, dtc) + dnl Setup toolchain settings for build-time tools.. if test "x$cross_compiling" = "xno"; then : "${AR_FOR_BUILD:=\$(AR)}" diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in index bd58074491fc..eed4d1cf675b 100644 --- a/sim/moxie/Makefile.in +++ b/sim/moxie/Makefile.in @@ -17,8 +17,6 @@ ## COMMON_PRE_CONFIG_FRAG -DTC = @DTC@ - dtbdir = @datadir@/gdb/dtb SIM_OBJS = \ diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac index c7475b799a6f..08bf6ff8acbc 100644 --- a/sim/moxie/configure.ac +++ b/sim/moxie/configure.ac @@ -4,6 +4,4 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_COMMON -AC_CHECK_TOOL(DTC, dtc) - SIM_AC_OUTPUT -- 2.31.1