From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id znevKwQF9V+NTQAAWB0awg (envelope-from ) for ; Tue, 05 Jan 2021 19:32:04 -0500 Received: by simark.ca (Postfix, from userid 112) id A95651F0AA; Tue, 5 Jan 2021 19:32:04 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 430451E590 for ; Tue, 5 Jan 2021 19:32:01 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D899393C872; Wed, 6 Jan 2021 00:32:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D899393C872 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609893120; bh=wJPNdyblfTApcwG2GENcopKPZ9xz/dHgedzf2hm5ZfE=; 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=Cc46e2h7WT9BW0adnNB4Bvb4Q7AO9NBv2kcp01XlXG+iPANTtNyYG9nC87FabmH2i VLsRdgg3walIFg/4RHIxKaMVS8mXEIUfMCdlIkfrSh8LHSWVMeYR4FWLcySEQa6vdw 5DiPnnL1PbWGQoCPJs98ejV6PbVWp/DcbgH51Ito= Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 7E7DA3851C16 for ; Wed, 6 Jan 2021 00:31:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7E7DA3851C16 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 7102F340E57 for ; Wed, 6 Jan 2021 00:31:55 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] sim: testsuite: delete configure script Date: Tue, 5 Jan 2021 19:31:53 -0500 Message-Id: <20210106003153.10937-1-vapier@gentoo.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210105065548.9260-1-vapier@gentoo.org> References: <20210105065548.9260-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@sourceware.org Sender: "Gdb-patches" Now that we've moved all ports to dejagnu & testsuite/sim/, the only thing the testsuite/configure script has been doing is filling in the sim_arch field in the testsuite/Makefile. We can simply let the top sim/configure script do that for us now. This simplifies & speeds up the build a bit by killing an entire configure script. --- sim/ChangeLog | 7 + sim/configure | 16 +- sim/configure.ac | 16 +- sim/testsuite/ChangeLog | 5 + sim/testsuite/Makefile.in | 8 +- sim/testsuite/configure | 3095 ------------------------------------ sim/testsuite/configure.ac | 16 - 7 files changed, 27 insertions(+), 3136 deletions(-) delete mode 100755 sim/testsuite/configure delete mode 100644 sim/testsuite/configure.ac diff --git a/sim/ChangeLog b/sim/ChangeLog index 047ff6ba0800..f2f77d8d1629 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,10 @@ +2021-01-04 Mike Frysinger + + * configure.ac: Delete AC_CONFIG_SUBDIRS(testsuite) call. + Add AC_CONFIG_FILES([Makefile testsuite/Makefile]) call. + Drop argument to AC_OUTPUT. + * configure: Regenerate. + 2020-11-01 Simon Marchi * bpf/configure: Re-generate. diff --git a/sim/configure b/sim/configure index 34f1a15a4c63..26cd9a68d3d1 100755 --- a/sim/configure +++ b/sim/configure @@ -696,7 +696,6 @@ erc32 ppc ft32 v850 -testsuite igen' # Initialize some variables set by options. @@ -3914,17 +3913,13 @@ subdirs="$subdirs aarch64" esac - if test x"${sim_arch}" != x; then - subdirs="$subdirs testsuite" + if test "$sim_igen" = yes; then + subdirs="$subdirs igen" - if test "$sim_igen" = yes; then - subdirs="$subdirs igen" - - fi - fi + fi fi -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile testsuite/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4633,6 +4628,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -5232,5 +5228,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - -exit 0 diff --git a/sim/configure.ac b/sim/configure.ac index d92ca25d3978..7de8b99888bf 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -42,15 +42,11 @@ m4_define([SIM_ARCH], [ AC_CONFIG_SUBDIRS($1) ]) if test "${enable_sim}" != no; then - sinclude(configure.tgt) - if test x"${sim_arch}" != x; then - AC_CONFIG_SUBDIRS(testsuite) - if test "$sim_igen" = yes; then - AC_CONFIG_SUBDIRS(igen) - fi - fi + sinclude(configure.tgt) + if test "$sim_igen" = yes; then + AC_CONFIG_SUBDIRS(igen) + fi fi -AC_OUTPUT(Makefile) - -exit 0 +AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_OUTPUT diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 4e27a91c21ee..345147ff5b9f 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-01-05 Mike Frysinger + + * configure, configure.ac: Delete. + * Makefile.in (Makefile, config.status): Switch to ../config.status. + 2021-01-05 Mike Frysinger * configure.ac (target): Delete d10v-*-elf case. diff --git a/sim/testsuite/Makefile.in b/sim/testsuite/Makefile.in index d1ac988adf88..1f75db6a5539 100644 --- a/sim/testsuite/Makefile.in +++ b/sim/testsuite/Makefile.in @@ -171,11 +171,11 @@ distclean maintainer-clean realclean: clean done ; \ else true; fi -Makefile : Makefile.in config.status - $(SHELL) config.status +Makefile : Makefile.in ../config.status + $(SHELL) ../config.status -config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck +config.status: $(srcdir)/../configure + $(SHELL) ../config.status --recheck # FIXME: Requires --enable-maintainer-mode, which one could add, but # it's provided by automake. Maybe switch to automake someday. #$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in diff --git a/sim/testsuite/configure b/sim/testsuite/configure deleted file mode 100755 index c90da3e6fff4..000000000000 --- a/sim/testsuite/configure +++ /dev/null diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac deleted file mode 100644 index 140eb7d5a762..000000000000 --- a/sim/testsuite/configure.ac +++ /dev/null @@ -1,16 +0,0 @@ -dnl Process this file file with autoconf to produce a configure script. -dnl This file is a shell script fragment that supplies the information -dnl necessary to tailor a template configure script into the configure -dnl script appropriate for this directory. For more information, check -dnl any existing configure script. - -AC_INIT(common/bits-tst.c) - -CC=${CC-cc} -AC_SUBST(CC) -AC_CONFIG_AUX_DIR(../..) -AC_CANONICAL_SYSTEM - -sinclude(../configure.tgt) - -AC_OUTPUT(Makefile) -- 2.28.0