Merge from mainline.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8b4c8703220dabbd2eb981d4ddd230e6bd2c1ce6..3420d9912c0c377d565df0ccf9d833743a757e33 100644 (file)
--- 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 134faebe046ecd8a4a03a4c4066d2cda6e61b714..b563c3487dd55aa82c9f72155a88d48379043351 100644 (file)
--- 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 1c912578c57fdfb788fb7a784270c3d5dc3e0892..11185d825fd8521e9a561a6f3d47719159ca9123 100644 (file)
--- 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.