From: Hans-Peter Nilsson <hp@axis.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH 04/12] sim/testsuite/cris/c: Use -sim3 but only for newlib targets
Date: Tue, 15 Feb 2022 00:02:55 +0100 [thread overview]
Message-ID: <20220214230255.DC76120439@pchp3.se.axis.com> (raw)
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
next prev reply other threads:[~2022-02-14 23:02 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 22:58 [PATCH 00/12] A little TLC for the simulators (in particular CRIS) Hans-Peter Nilsson
2022-02-14 22:59 ` [PATCH 01/12] sim cris: Correct PRIu32 to PRIx32 Hans-Peter Nilsson
2022-02-16 4:43 ` Mike Frysinger
2022-02-14 23:02 ` [PATCH 03/12] sim/testsuite: Set global_cc_os also when no compiler is found Hans-Peter Nilsson
2022-02-16 4:42 ` Mike Frysinger
2022-02-14 23:02 ` Hans-Peter Nilsson [this message]
2022-02-15 17:43 ` [PATCH 04/12] sim/testsuite/cris/c: Use -sim3 but only for newlib targets Dimitar Dimitrov
2022-02-15 22:49 ` Hans-Peter Nilsson
2022-02-16 5:25 ` Mike Frysinger
2022-02-16 6:07 ` Hans-Peter Nilsson
2022-02-16 7:34 ` Mike Frysinger
2022-02-16 5:39 ` Mike Frysinger
2022-02-16 6:09 ` Hans-Peter Nilsson
2022-02-16 7:17 ` Mike Frysinger
2022-02-16 15:27 ` Hans-Peter Nilsson
2022-02-14 23:03 ` [PATCH 06/12] sim/testsuite: Support "requires: simoption <--name-of-option>" Hans-Peter Nilsson
2022-02-16 4:49 ` Mike Frysinger
2022-02-16 6:24 ` Hans-Peter Nilsson
2022-02-16 7:09 ` Mike Frysinger
2022-02-16 15:25 ` Hans-Peter Nilsson
2022-02-14 23:05 ` [PATCH 08/12] sim cris: Unbreak --disable-sim-hardware builds Hans-Peter Nilsson
2022-02-16 4:51 ` Mike Frysinger
2022-02-16 5:54 ` Hans-Peter Nilsson
2022-02-16 6:48 ` Hans-Peter Nilsson
2022-02-16 7:15 ` Mike Frysinger
2022-02-14 23:05 ` [PATCH 09/12] sim: Fix use of out-of-tree assembler and linker when testing Hans-Peter Nilsson
2022-02-16 5:03 ` Mike Frysinger
2022-02-14 23:06 ` [PATCH 10/12] sim: Add sim_dump_memory for debugging Hans-Peter Nilsson
2022-02-16 5:02 ` Mike Frysinger
2022-02-16 6:10 ` Hans-Peter Nilsson
2022-02-16 6:41 ` Hans-Peter Nilsson
2022-02-17 2:05 ` Hans-Peter Nilsson
2022-02-17 5:30 ` Mike Frysinger
2022-02-14 23:07 ` [PATCH 11/12] sim/testsuite/cris: Remove faulty use of basename in C tests Hans-Peter Nilsson
2022-02-16 4:57 ` Mike Frysinger
2022-02-16 6:44 ` Hans-Peter Nilsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220214230255.DC76120439@pchp3.se.axis.com \
--to=hp@axis.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).