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.
This commit is contained in:
parent
b2672dd630
commit
ce95db102a
2 changed files with 3 additions and 3 deletions
|
@ -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]] {
|
||||
|
|
|
@ -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 {}
|
||||
|
|
Loading…
Add table
Reference in a new issue