* config/default.exp (ld_nm): Add "nmflags" arg.
* lib/ld-lib.exp (default_ld_nm): Likewise. * ld-empic/empic.exp: Adjust call to ld_nm. * ld-scripts/defined.exp: Likewise. * ld-scripts/script.exp: Likewise. * ld-scripts/sizeof.exp: Likewise. * ld-selective/selective.exp: Likewise. * ld-sh/sh.exp: Likewise.
This commit is contained in:
parent
2f45a6e05b
commit
992c450de8
|
@ -1,3 +1,14 @@
|
||||||
|
2001-07-24 Alan Modra <amodra@bigpond.net.au>
|
||||||
|
|
||||||
|
* config/default.exp (ld_nm): Add "nmflags" arg.
|
||||||
|
* lib/ld-lib.exp (default_ld_nm): Likewise.
|
||||||
|
* ld-empic/empic.exp: Adjust call to ld_nm.
|
||||||
|
* ld-scripts/defined.exp: Likewise.
|
||||||
|
* ld-scripts/script.exp: Likewise.
|
||||||
|
* ld-scripts/sizeof.exp: Likewise.
|
||||||
|
* ld-selective/selective.exp: Likewise.
|
||||||
|
* ld-sh/sh.exp: Likewise.
|
||||||
|
|
||||||
2001-07-12 H.J. Lu <hjl@gnu.org>
|
2001-07-12 H.J. Lu <hjl@gnu.org>
|
||||||
|
|
||||||
* ld-selective/selective.exp: Mark selective1, selective2,
|
* ld-selective/selective.exp: Mark selective1, selective2,
|
||||||
|
|
|
@ -158,8 +158,8 @@ proc ld_assemble { as source object } {
|
||||||
# ld_nm
|
# ld_nm
|
||||||
# run nm on a file
|
# run nm on a file
|
||||||
#
|
#
|
||||||
proc ld_nm { nm object } {
|
proc ld_nm { nm nmflags object } {
|
||||||
default_ld_nm $nm $object
|
default_ld_nm $nm $nmflags $object
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -60,7 +60,7 @@ if ![ld_simple_link $ld tmpdir/relax "--relax -T $srcdir/$subdir/relax.t tmpdir/
|
||||||
# computes the start of the function.
|
# computes the start of the function.
|
||||||
|
|
||||||
# Get the symbol table.
|
# Get the symbol table.
|
||||||
if ![ld_nm $nm tmpdir/relax] {
|
if ![ld_nm $nm "" tmpdir/relax] {
|
||||||
unresolved $testname
|
unresolved $testname
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ if ![ld_assemble $as $srcdir/$subdir/defined.s tmpdir/def.o] {
|
||||||
if ![ld_simple_link $ld tmpdir/def "-T $srcdir/$subdir/defined.t tmpdir/def.o"] {
|
if ![ld_simple_link $ld tmpdir/def "-T $srcdir/$subdir/defined.t tmpdir/def.o"] {
|
||||||
fail $testname
|
fail $testname
|
||||||
} else {
|
} else {
|
||||||
if ![ld_nm $nm tmpdir/def] {
|
if ![ld_nm $nm "" tmpdir/def] {
|
||||||
unresolved $testname
|
unresolved $testname
|
||||||
} else {
|
} else {
|
||||||
if {![info exists nm_output(value1)] \
|
if {![info exists nm_output(value1)] \
|
||||||
|
|
|
@ -29,7 +29,7 @@ proc check_script { } {
|
||||||
global testname
|
global testname
|
||||||
global nm_output
|
global nm_output
|
||||||
|
|
||||||
if ![ld_nm $nm tmpdir/script] {
|
if ![ld_nm $nm "" tmpdir/script] {
|
||||||
unresolved $testname
|
unresolved $testname
|
||||||
} else {
|
} else {
|
||||||
if {![info exists nm_output(text_start)] \
|
if {![info exists nm_output(text_start)] \
|
||||||
|
|
|
@ -30,7 +30,7 @@ if ![ld_simple_link $ld tmpdir/sizeof "-T $srcdir/$subdir/sizeof.t tmpdir/sizeof
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ![ld_nm $nm tmpdir/sizeof] {
|
if ![ld_nm $nm "" tmpdir/sizeof] {
|
||||||
unresolved $testname
|
unresolved $testname
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ foreach testitem $seltests {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if ![ld_nm $nm $ldfile] {
|
if ![ld_nm $nm "" $ldfile] {
|
||||||
unresolved $testname
|
unresolved $testname
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ if ![ld_assemble $as "-relax $srcdir/$subdir/sh1.s" tmpdir/sh1.o] {
|
||||||
} else { if ![ld_simple_link $ld tmpdir/sh1 "-relax tmpdir/sh1.o"] {
|
} else { if ![ld_simple_link $ld tmpdir/sh1 "-relax tmpdir/sh1.o"] {
|
||||||
fail $testsimple
|
fail $testsimple
|
||||||
} else {
|
} else {
|
||||||
if ![ld_nm $nm tmpdir/sh1] {
|
if ![ld_nm $nm "" tmpdir/sh1] {
|
||||||
unresolved $testsimple
|
unresolved $testsimple
|
||||||
} else {
|
} else {
|
||||||
if {![info exists nm_output(bar)] \
|
if {![info exists nm_output(bar)] \
|
||||||
|
|
|
@ -283,7 +283,7 @@ proc default_ld_assemble { as source object } {
|
||||||
# default_ld_nm
|
# default_ld_nm
|
||||||
# run nm on a file, putting the result in the array nm_output
|
# run nm on a file, putting the result in the array nm_output
|
||||||
#
|
#
|
||||||
proc default_ld_nm { nm object } {
|
proc default_ld_nm { nm nmflags object } {
|
||||||
global NMFLAGS
|
global NMFLAGS
|
||||||
global nm_output
|
global nm_output
|
||||||
global host_triplet
|
global host_triplet
|
||||||
|
@ -299,9 +299,9 @@ proc default_ld_nm { nm object } {
|
||||||
|
|
||||||
if ![info exists NMFLAGS] { set NMFLAGS "" }
|
if ![info exists NMFLAGS] { set NMFLAGS "" }
|
||||||
|
|
||||||
verbose -log "$nm $NMFLAGS $object >tmpdir/nm.out"
|
verbose -log "$nm $NMFLAGS $nmflags $object >tmpdir/nm.out"
|
||||||
|
|
||||||
catch "exec $nm $NMFLAGS $object >tmpdir/nm.out" exec_output
|
catch "exec $nm $NMFLAGS $nmflags $object >tmpdir/nm.out" exec_output
|
||||||
set exec_output [prune_warnings $exec_output]
|
set exec_output [prune_warnings $exec_output]
|
||||||
if [string match "" $exec_output] then {
|
if [string match "" $exec_output] then {
|
||||||
set file [open tmpdir/nm.out r]
|
set file [open tmpdir/nm.out r]
|
||||||
|
|
Loading…
Reference in New Issue