From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: testsuite: add dedicated flag for init toolchain tests
Date: Sat, 27 Nov 2021 03:18:53 -0500 [thread overview]
Message-ID: <20211127081853.26792-1-vapier@gentoo.org> (raw)
As we setup more reliable CC_FOR_TARGET variables for each target, the
bfin way of overriding it to stuff custom CFLAGS doesn't scale well.
Add a dedicated CFLAGS_FOR_TARGET_init setting that each set of tests
can setup if they want to add custom options.
---
sim/testsuite/bfin/allinsn.exp | 4 ++--
sim/testsuite/lib/sim-defs.exp | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp
index a9dc08457b26..2be369dc9383 100644
--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@@ -2,9 +2,9 @@
# Set a default CPU to satisfy bfin-elf-gcc requirements. BF537 should work
# with all standard Blackfin toolchains.
-set CC_FOR_TARGET "[find_gcc] -mcpu=bf537"
+global CFLAGS_FOR_TARGET_init
+set CFLAGS_FOR_TARGET_init "-mcpu=bf537"
sim_init
-unset CC_FOR_TARGET
if [istarget bfin-*-elf] {
# all machines
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index fca66af26a86..cd16bbb13b96 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -55,6 +55,7 @@ proc sim_init_toolchain {} {
global global_cpp_works
global global_cc_works
global global_cc_os
+ global CFLAGS_FOR_TARGET_init
# Reset all the toolchain settings. This provides a clean slate when
# starting the next set of tests.
@@ -64,24 +65,30 @@ proc sim_init_toolchain {} {
set SIMFLAGS_FOR_TARGET ""
unset -nocomplain cpu_option cpu_option_sep
+ # Merge per-test settings if available.
+ if ![info exists CFLAGS_FOR_TARGET_init] {
+ set CFLAGS_FOR_TARGET_init ""
+ }
+ set cc_options [list "additional_flags=$CFLAGS_FOR_TARGET_init"]
+
# See if we have a preprocessor available.
set result [target_compile $srcdir/lib/compilercheck.c \
- $objdir/compilercheck.x "preprocess" ""]
+ $objdir/compilercheck.x "preprocess" $cc_options]
set global_cpp_works [string equal "" "$result"]
# See if we have a compiler available, and which environment it's targeting.
if { [target_compile $srcdir/lib/newlibcheck.c \
- $objdir/compilercheck.x "executable" ""] == "" } {
+ $objdir/compilercheck.x "executable" $cc_options] == "" } {
verbose -log "Found newlib C compiler"
set global_cc_works 1
set global_cc_os "newlib"
} elseif { [target_compile $srcdir/lib/linuxcheck.c \
- $objdir/compilercheck.x "executable" ""] == "" } {
+ $objdir/compilercheck.x "executable" $cc_options] == "" } {
verbose -log "Found Linux C compiler"
set global_cc_works 1
set global_cc_os "linux"
} elseif { [target_compile $srcdir/lib/compilercheck.c \
- $objdir/compilercheck.x "executable" ""] == "" } {
+ $objdir/compilercheck.x "executable" $cc_options] == "" } {
verbose -log "Found C compiler, but unknown OS"
set global_cc_works 1
set global_cc_os ""
@@ -91,6 +98,8 @@ proc sim_init_toolchain {} {
}
file delete $objdir/compilercheck.x
+
+ unset CFLAGS_FOR_TARGET_init
}
# Print the version of the simulator being tested.
--
2.33.0
reply other threads:[~2021-11-27 8:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20211127081853.26792-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--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).