diff options
| author | Phil Blundell <philb@gnu.org> | 2000-10-23 08:00:46 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2000-10-23 08:00:46 +0000 |
| commit | b836e75b91818b898a5e06455c6eff8e6c23acfa (patch) | |
| tree | 17d6b2a2fc25627fe01d5891655ce95955991397 | |
| parent | 1cd44cf50f4e5277477e2fe1e740bc7d6f47d108 (diff) | |
| download | binutils-b836e75b91818b898a5e06455c6eff8e6c23acfa.zip binutils-b836e75b91818b898a5e06455c6eff8e6c23acfa.tar.gz binutils-b836e75b91818b898a5e06455c6eff8e6c23acfa.tar.bz2 | |
Merge from mainline.
| -rw-r--r-- | ld/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-elfvsb/elfvsb.exp | 16 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 16 |
3 files changed, 13 insertions, 23 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 8b4c870..3420d99 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2000-10-17 Philip Blundell <pb@futuretv.com> + + * lib/ld-lib.exp, ld-elfvsb: Update from trunk version. + 2000-04-12 Alan Modra <alan@linuxcare.com.au> * ld-selective/selective.exp (test4): Delete incorrect foo__1B test. diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp index 134faeb..b563c34 100644 --- a/ld/testsuite/ld-elfvsb/elfvsb.exp +++ b/ld/testsuite/ld-elfvsb/elfvsb.exp @@ -232,10 +232,6 @@ proc visibility_run {visibility} { } else { setup_xfail "*-*-sunos4*" } - if { [ string match $visibility "hidden_weak" ] - || [ string match $visibility "protected_weak" ] } { - setup_xfail "powerpc-*-linux*" - } visibility_test $visibility vnp "visibility ($visibility) (non PIC)" mainnp.o sh1np.o sh2np.o elfvsb # Test ELF shared library relocations with a non-zero load @@ -251,14 +247,6 @@ proc visibility_run {visibility} { setup_xfail "*-*-sunos4*" setup_xfail "*-*-linux*libc1" } - if { [ string match $visibility "hidden_normal" ] - || [ string match $visibility "hidden_weak" ] - || [ string match $visibility "protected" ] - || [ string match $visibility "protected_undef_def" ] - || [ string match $visibility "protected_weak" ] - || [ string match $visibility "normal" ] } { - setup_xfail "powerpc-*-linux*" - } visibility_test $visibility vnp "visibility ($visibility) (non PIC, load offset)" \ mainnp.o sh1np.o sh2np.o elfvsb \ "-T $srcdir/$subdir/elf-offset.ld" @@ -306,10 +294,6 @@ proc visibility_run {visibility} { } else { setup_xfail "*-*-sunos4*" } - if { [ string match $visibility "hidden_weak" ] - || [ string match $visibility "protected_weak" ] } { - setup_xfail "powerpc-*-linux*" - } visibility_test $visibility vmpnp "visibility ($visibility) (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o elfvsb } } else { diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 1c91257..11185d8 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -85,6 +85,7 @@ proc default_ld_link { ld target objects } { global HOSTING_LIBS global LIBS global host_triplet + global link_output set objs "$HOSTING_CRT0 $objects" set libs "$LIBS $HOSTING_LIBS" @@ -98,12 +99,12 @@ proc default_ld_link { ld target objects } { verbose -log "$ld $HOSTING_EMU $flags -o $target $objs $libs" - catch "exec $ld $HOSTING_EMU $flags -o $target $objs $libs" exec_output - set exec_output [prune_warnings $exec_output] - if [string match "" $exec_output] then { + catch "exec $ld $HOSTING_EMU $flags -o $target $objs $libs" link_output + set exec_output [prune_warnings $link_output] + if [string match "" $link_output] then { return 1 } else { - verbose -log "$exec_output" + verbose -log "$link_output" return 0 } } @@ -114,7 +115,8 @@ proc default_ld_link { ld target objects } { # proc default_ld_simple_link { ld target objects } { global host_triplet - + global link_output + if { [which $ld] == 0 } then { perror "$ld does not exist" return 0 @@ -124,8 +126,8 @@ proc default_ld_simple_link { ld target objects } { verbose -log "$ld $flags -o $target $objects" - catch "exec $ld $flags -o $target $objects" exec_output - set exec_output [prune_warnings $exec_output] + catch "exec $ld $flags -o $target $objects" link_output + set exec_output [prune_warnings $link_output] # We don't care if we get a warning about a non-existent start # symbol, since the default linker script might use ENTRY. |