public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] [gdb/testsuite] Factor out with_PIE_multilib_flags_filtered
@ 2022-10-14 11:10 Tom de Vries
0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2022-10-14 11:10 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1806054393e033dfac661fe4f68683a23646cb61
commit 1806054393e033dfac661fe4f68683a23646cb61
Author: Tom de Vries <tdevries@suse.de>
Date: Fri Oct 14 13:09:50 2022 +0200
[gdb/testsuite] Factor out with_PIE_multilib_flags_filtered
Factor out new procs with_PIE_multilib_flags_filtered and
with_multilib_flags_filtered from proc gdb_compile_shlib.
Tested on x86_64-linux.
Diff:
---
gdb/testsuite/lib/gdb.exp | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 3049a7392a4..7de8bb60c19 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4983,20 +4983,17 @@ proc gdb_compile_shlib_1 {sources dest options} {
return ""
}
-# Build a shared library from SOURCES. Ignore target boards PIE-related
-# multilib_flags.
+# Ignore FLAGS in target board multilib_flags while executing BODY.
-proc gdb_compile_shlib {sources dest options} {
+proc with_multilib_flags_filtered { flags body } {
global board
- # Ignore PIE-related setting in multilib_flags.
+ # Ignore flags in multilib_flags.
set board [target_info name]
set multilib_flags_orig [board_info $board multilib_flags]
set multilib_flags ""
foreach op $multilib_flags_orig {
- if { $op == "-pie" || $op == "-no-pie" \
- || $op == "-fPIE" || $op == "-fno-PIE"} {
- } else {
+ if { [lsearch -exact $flags $op] == -1 } {
append multilib_flags " $op"
}
}
@@ -5004,6 +5001,24 @@ proc gdb_compile_shlib {sources dest options} {
save_target_board_info { multilib_flags } {
unset_board_info multilib_flags
set_board_info multilib_flags "$multilib_flags"
+ set result [uplevel 1 $body]
+ }
+
+ return $result
+}
+
+# Ignore PIE-related flags in target board multilib_flags while executing BODY.
+
+proc with_PIE_multilib_flags_filtered { body } {
+ set pie_flags [list "-pie" "-no-pie" "-fPIE" "-fno-PIE"]
+ return [uplevel 1 [list with_multilib_flags_filtered $pie_flags $body]]
+}
+
+# Build a shared library from SOURCES. Ignore target boards PIE-related
+# multilib_flags.
+
+proc gdb_compile_shlib {sources dest options} {
+ with_PIE_multilib_flags_filtered {
set result [gdb_compile_shlib_1 $sources $dest $options]
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-14 11:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-14 11:10 [binutils-gdb] [gdb/testsuite] Factor out with_PIE_multilib_flags_filtered Tom de Vries
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).