* lib/ld-lib.exp (check_gc_sections_available): Fail more targets.

[deliverable/binutils-gdb.git] / ld / testsuite / lib / ld-lib.exp

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 65a5ffb116a351630fb5493f84d865ce89500ab4..9f2e249c901a9a6898096a972067c6be5e85a042 100644 (file)
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1,6 +1,6 @@
 # Support routines for LD testsuite.
 #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#    2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+#    2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -179,17 +179,20 @@ proc default_ld_simple_link { ld target objects } {
     # based on the name of the compiler.
     set ldexe $ld
     set ldparm [string first " " $ld]
+    set ldflags ""
     if { $ldparm > 0 } then {
+       set ldflags [string range $ld $ldparm end]
        set ldexe [string range $ld 0 $ldparm]
+       set ld $ldexe
     }
     set ldexe [string replace $ldexe 0 [string last "/" $ldexe] ""]
     if {[string match "*gcc*" $ldexe] || [string match "*++*" $ldexe]} then {
-       set flags "$gcc_ld_flag $flags"
+       set ldflags "$gcc_ld_flag $ldflags"
     }
 
     remote_file host delete $target
 
-    set exec_output [run_host_cmd "$ld" "$flags -o $target $objects"]
+    set exec_output [run_host_cmd "$ld" "$ldflags $flags -o $target $objects"]
     set exec_output [prune_warnings $exec_output]
 
     # We don't care if we get a warning about a non-existent start
@@ -404,6 +407,7 @@ proc is_elf_format {} {
         && ![istarget *-*-linux*] \
         && ![istarget frv-*-uclinux*] \
         && ![istarget bfin-*-uclinux] \
+        && ![istarget sh*-*-uclinux*] \
         && ![istarget *-*-irix5*] \
         && ![istarget *-*-irix6*] \
         && ![istarget *-*-netbsd*] \
@@ -654,11 +658,13 @@ proc simple_diff { file_1 file_2 } {
 #   error: REGEX
 #      An error with message matching REGEX must be emitted for the test
 #      to pass.  The PROG, objdump, nm and objcopy options have no
-#      meaning and need not supplied if this is present.
+#      meaning and need not supplied if this is present.  Multiple "error"
+#      directives append to the expected linker error message.
 #
 #   warning: REGEX
 #      Expect a linker warning matching REGEX.  It is an error to issue
-#      both "error" and "warning".
+#      both "error" and "warning".  Multiple "warning" directives
+#      append to the expected linker warning message.
 #
 # Each option may occur at most once unless otherwise mentioned.
 #
@@ -725,6 +731,8 @@ proc run_dump_test { name } {
            xfail {}
            target {}
            notarget {}
+           warning {}
+           error {}
            source {
                # Move any source-specific as-flags to a separate array to
                # simplify processing.
@@ -925,8 +933,9 @@ proc run_dump_test { name } {
            send_log "$comp_output\n"
            verbose "$comp_output" 3
 
-           if { [regexp $expmsg $comp_output] \
-                   && (($cmdret == 0) == ($opts(warning) != "")) } {
+           if { ($expmsg == "") == ($comp_output == "") \
+                   && [regexp $expmsg $comp_output] \
+                   && (($cmdret == 0) == ($opts(error) == "")) } {
                # We have the expected output from ld.
                if { $opts(error) != "" || $program == "" } {
                    pass $testname
@@ -974,6 +983,7 @@ proc run_dump_test { name } {
     set env(LC_ALL) "C"
     send_log "$cmd\n"
     set cmdret [remote_exec host [concat sh -c [list "$cmd 2>ld.tmp"]] "" "/dev/null"]
+    set cmdret [lindex $cmdret 0]
     remote_upload host "ld.tmp"
     set comp_output [prune_warnings [file_contents "ld.tmp"]]
     remote_file host delete "ld.tmp"
@@ -983,8 +993,8 @@ proc run_dump_test { name } {
     } else {
        unset env(LC_ALL)
     }
-    if ![string match "" $comp_output] then {
-       send_log "$comp_output\n"
+    if { $cmdret != 0 || $comp_output != "" } {
+       send_log "exited abnormally with $cmdret, output:$comp_output\n"
        fail $testname
        return
     }
@@ -1039,6 +1049,7 @@ proc regexp_diff { file_1 file_2 } {
     set end_2 0
     set differences 0
     set diff_pass 0
+    set fail_if_match 0
 
     if [file exists $file_1] then {
        set file_a [open $file_1 r]
@@ -1071,6 +1082,10 @@ proc regexp_diff { file_1 file_2 } {
                set end_2 1
                set diff_pass 1
                break
+           } elseif [ string match "#failif" $line_b ] {
+               send_log "fail if no difference\n"
+               verbose "fail if no difference" 3
+               set fail_if_match 1
            } elseif [ string match "#..." $line_b ] {
                if { [gets $file_b line_b] == $eof } {
                    set end_2 1
@@ -1123,6 +1138,14 @@ proc regexp_diff { file_1 file_2 } {
        set differences 1
     }
 
+    if { $fail_if_match } {
+       if { $differences == 0 } {
+           set differences 1
+       } else {
+           set differences 0
+       }
+    }
+
     close $file_a
     close $file_b
 
@@ -1633,9 +1656,19 @@ proc check_gc_sections_available { } {
     if {![info exists gc_sections_available_saved]} {
        # Some targets don't support gc-sections despite whatever's
        # advertised by ld's options.
-       if { [istarget alpha*-*-*]
-            || [istarget mep-*-*]
+       if {[istarget arc-*-*]
+            || [istarget d30v-*-*]
+            || [istarget dlx-*-*]
+            || [istarget i960-*-*]
+            || [istarget or32-*-*]
+            || [istarget pj*-*-*]
+            || [istarget alpha-*-*]
+            || [istarget hppa64-*-*]
+            || [istarget i370-*-*]
+            || [istarget i860-*-*]
             || [istarget ia64-*-*]
+            || [istarget mep-*-*]
+            || [istarget mn10200-*-*]
             || [istarget *-*-cygwin]
             || [istarget *-*-mingw*] } {
            set gc_sections_available_saved 0