From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KEkiHLTfCmKragAAWB0awg (envelope-from ) for ; Mon, 14 Feb 2022 18:03:16 -0500 Received: by simark.ca (Postfix, from userid 112) id 705831F3C5; Mon, 14 Feb 2022 18:03:16 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,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 C102E1EA69 for ; Mon, 14 Feb 2022 18:03:15 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F6B2385843E for ; Mon, 14 Feb 2022 23:03:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F6B2385843E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1644879795; bh=HZ9ICfS2YoOm5dK4Lvyyoh84aCMHpUhnzEDF/8XznqQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=bXcMTZfmZb7x0i8JKgwaCwalbwc4VIDMUv9KIOQVeasdXSwZfQcyaqrN9jhkzcpIj xW9ImgVheAPBDDMInl4S6W6cW00SF4B+UPuD/g8wWwMUf4ZXh3by1HJl/+qaw7MGrz EtJZW+f3hfOxTt6oc/hh42IWL8d7xxE1PzWmok3Y= Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by sourceware.org (Postfix) with ESMTPS id 1BDD93858D3C for ; Mon, 14 Feb 2022 23:02:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1BDD93858D3C To: Subject: [PATCH 04/12] sim/testsuite/cris/c: Use -sim3 but only for newlib targets MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT Message-ID: <20220214230255.DC76120439@pchp3.se.axis.com> Date: Tue, 15 Feb 2022 00:02:55 +0100 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: Hans-Peter Nilsson via Gdb-patches Reply-To: Hans-Peter Nilsson Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Commit a39487c6685f "sim: cris: use -sim with C tests for cris-elf targets" caused " -sim" to be appended to CFLAGS_FOR_TARGET for cris*-*-elf, where testing had until then relied on "RUNTESTFLAGS=--target_board=cris-sim" being passed when running "make check-sim", adding the right options. While "-sim" happens to work, the baseboard-file cris-sim.exp uses "-sim3" so for consistency use that instead. Then commit b42f20d2ac72 "sim: testsuite: drop most specific istarget checks" caused " -sim" to be appended for *all* targets, which just doesn't work. For example, for crisv32-linux-gnu, that's not a recognized option and will cause a dejagnu error and further testing in c.exp will be aborted. While cris-sim.exp appends "-static" for *-linux-gnu, further changes in the test-suite have caused "linux"-specific tests to break, so that part will be tended to separately. But, save and restore CFLAGS_FOR_TARGET around the modification and use where needed, to not have the CRIS-specific modification affect a continuing test-run (possibly for other targets). sim/testsuite/cris: * c/c.exp (CFLAGS_FOR_TARGET): Replace appended option " -sim" with " -sim3", but do it conditionally for newlib targets. Save and restore CFLAGS_FOR_TARGET in saved_CFLAGS_FOR_TARGET such that it doesn't affect the value of CFLAGS_FOR_TARGET outside c.exp. --- sim/testsuite/cris/c/c.exp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp index 5711fd2f0bcd..3e186e072d8e 100644 --- a/sim/testsuite/cris/c/c.exp +++ b/sim/testsuite/cris/c/c.exp @@ -17,6 +17,9 @@ sim_init +global global_cc_works +global global_cc_os + set CFLAGS_FOR_TARGET "-O2" if [istarget cris-*-*] { set mach "crisv10" @@ -24,13 +27,16 @@ if [istarget cris-*-*] { set mach "crisv32" } -if [istarget *] { - append CFLAGS_FOR_TARGET " -sim" +# Make sure we're using the right runtime for simulator runs. If the +# cris-sim dejagnu baseboard is used, -sim3 will be duplicated, but +# that's ok. For e.g. cris*-linux-gnu, neither -sim not -sim3 are +# supported options and likely not other targets too. +set saved_CFLAGS_FOR_TARGET $CFLAGS_FOR_TARGET +if { $global_cc_os == "newlib" } { + append CFLAGS_FOR_TARGET " -sim3" } # Using target_compile, since it is less noisy, -global global_cc_works -global global_cc_os if { $global_cc_works == 1 } { # Now check if we can link a program dynamically, and where # libc.so is located. If it is, we provide a sym link to the @@ -239,3 +245,5 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] { $status "$mach $testname" } } + +set CFLAGS_FOR_TARGET $saved_CFLAGS_FOR_TARGET -- 2.30.2