diff options
| author | Alexandre Oliva <oliva@adacore.com> | 2020-06-02 14:33:38 -0300 |
|---|---|---|
| committer | Alexandre Oliva <oliva@gnu.org> | 2020-06-02 14:33:38 -0300 |
| commit | ce95db102aab4dea9af24a20de78db2f57c0a37b (patch) | |
| tree | 5f612db62c4cdd2a8e7cc56643d89e183282a0f0 | |
| parent | b2672dd630c81513e08829adc63294ffeedf5693 (diff) | |
| download | gcc-ce95db102aab4dea9af24a20de78db2f57c0a37b.zip gcc-ce95db102aab4dea9af24a20de78db2f57c0a37b.tar.gz gcc-ce95db102aab4dea9af24a20de78db2f57c0a37b.tar.bz2 | |
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.
| -rw-r--r-- | gcc/testsuite/gcc.misc-tests/outputs.exp | 2 | ||||
| -rw-r--r-- | 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 c3c6c2d..06a32db 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 d591cb3..87eeb7d 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 {} |