From ce95db102aab4dea9af24a20de78db2f57c0a37b Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 2 Jun 2020 14:33:38 -0300 Subject: [PATCH] spell ldscript correctly in outputs.exp et al In my recent changes to outputs.exp and gcc-defs.exp, I misreferenced dejagnu board property ldscript, singular, as ldscripts, plural. This probably didn't have much impact on gcc-defs.exp: the code there would just prefix with -Wl, any options that amounted to file names, and linker scripts probably wouldn't be named without a -T or even an -Wl,-T, prefix. The visible effects were in outputs.exp, that also intended to add the ldscript, if present, to the set of options to be passed to the compiler driver for linking. Using the wrong option name, that wouldn't work. for gcc/testsuite/ChangeLog * gcc.misc-tests/outputs.exp: Spell ldscript correctly. * lib/gcc-defs.exp (gcc_adjust_linker_flags): Likewise. --- gcc/testsuite/gcc.misc-tests/outputs.exp | 2 +- gcc/testsuite/lib/gcc-defs.exp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/gcc.misc-tests/outputs.exp b/gcc/testsuite/gcc.misc-tests/outputs.exp index c3c6c2dc0e6..06a32dbeb9e 100644 --- a/gcc/testsuite/gcc.misc-tests/outputs.exp +++ b/gcc/testsuite/gcc.misc-tests/outputs.exp @@ -48,7 +48,7 @@ set skip_lto ![check_effective_target_lto] # We do not compile to an executable, because that requires naming an output. set link_options "" set dest [target_info name] -foreach i { ldflags libs ldscripts } { +foreach i { ldflags libs ldscript } { if {[board_info $dest exists $i]} { set skip "" foreach opt [split [board_info $dest $i]] { diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp index d591cb36eb9..87eeb7dc17e 100644 --- a/gcc/testsuite/lib/gcc-defs.exp +++ b/gcc/testsuite/lib/gcc-defs.exp @@ -287,7 +287,7 @@ proc dg-additional-files { args } { set gcc_adjusted_linker_flags 0 -# Add -Wl, before any file names in ldflags, libs, and ldscripts, so +# Add -Wl, before any file names in ldflags, libs, and ldscript, so # that default object files or libraries do not change the names of # gcc auxiliary outputs. @@ -300,7 +300,7 @@ proc gcc_adjust_linker_flags {} { if {![is_remote host]} { set dest [target_info name] - foreach i { ldflags libs ldscripts } { + foreach i { ldflags libs ldscript } { if {[board_info $dest exists $i]} { set opts [board_info $dest $i] set nopts {} -- 2.30.2