X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=ffdf8051f3191e00433b632810c25f68b3b6494c;hb=bdd65db9b9cd6d5dbdff9b48e97379029f8a3a1a;hp=acfe0df838f091f18f6ab6dca29d884e992db885;hpb=fab4a87f1bd9ec148d24bdaca9faf0f6bded94aa;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index acfe0df838..ffdf8051f3 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1,10 +1,11 @@
 # Support routines for LD testsuite.
-#   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#    2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 1994-2014 Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -14,50 +15,131 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+proc load_common_lib { name } {
+    global srcdir
+    load_file $srcdir/../../binutils/testsuite/lib/$name
+}
+
+load_common_lib binutils-common.exp
+
+# Returns 1 if the gcc for the target is at least version MAJOR.MINOR
+# Returns 0 otherwise.
+#
+proc at_least_gcc_version { major minor } {
+
+    if {![info exists CC]} {
+	set CC [find_gcc]
+    }
+    if { $CC == "" } {
+      return 0
+    }
+    set state [remote_exec host $CC --version]
+    set tmp "[lindex $state 1]\n"
+    # Look for (eg) 4.6.1 in the version output.
+    set ver_re "\[^\\.0-9\]+(\[1-9\]\[0-9\]*)\\.(\[0-9\]+)(?:\\.\[0-9\]+)?"
+    regexp $ver_re $tmp fred maj min
+    verbose "gcc version: $tmp"
+    if { ![info exists maj] || ![info exists min] } then {
+	perror "can't decipher gcc version number, fix the framework!"
+	return 0
+    }
+    verbose "major gcc version is $maj, want at least $major"
+    if { $maj == $major } then {
+	verbose "minor gcc version is $min, want at least $minor"
+	return [expr $min >= $minor]
+    } else {
+	return [expr $maj > $major]
+    }
+}
 
 # Extract and print the version number of ld.
 #
 proc default_ld_version { ld } {
     global host_triplet
 
-    if { [which $ld] == 0 } then {
+    if { ![is_remote host] && [which $ld] == 0 } then {
 	perror "$ld does not exist"
 	exit 1
     }
 
-    catch "exec $ld --version" tmp
-    set tmp [prune_warnings $tmp]
+    remote_exec host "$ld --version" "" "/dev/null" "ld.version"
+    remote_upload host "ld.version"
+    set tmp [prune_warnings [file_contents "ld.version"]]
+    remote_file build delete "ld.version"
+    remote_file host delete "ld.version"
+
     regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" $tmp version cyg number
     if [info exists number] then {
 	clone_output "$ld $number\n"
     }
 }
 
-# Link an object using relocation.
-#
-proc default_ld_relocate { ld target objects } {
-    global HOSTING_EMU
-    global host_triplet
-    global exec_output
+proc run_host_cmd { prog command } {
+    global link_output
+    global gcc_B_opt
+    global ld_L_opt
 
-    if { [which $ld] == 0 } then {
-	perror "$ld does not exist"
+    if { ![is_remote host] && [which "$prog"] == 0 } then {
+	perror "$prog does not exist"
 	return 0
     }
 
-    catch "exec rm -f $target" exec_output
+    # If we are compiling with gcc, we want to add gcc_B_opt and
+    # ld_L_opt to flags.  However, if $prog already has -B options,
+    # which might be the case when running gcc out of a build
+    # directory, we want our -B options to come first.
+    set gccexe $prog
+    set gccparm [string first " " $gccexe]
+    set gccflags ""
+    if { $gccparm > 0 } then {
+	set gccflags [string range $gccexe $gccparm end]
+	set gccexe [string range $gccexe 0 $gccparm]
+	set prog $gccexe
+    }
+    set gccexe [string replace $gccexe 0 [string last "/" $gccexe] ""]
+    if {[string match "*cc*" $gccexe] || [string match "*++*" $gccexe]} then {
+	set gccflags "$gcc_B_opt $gccflags $ld_L_opt"
+    }
 
-    verbose -log "$ld $HOSTING_EMU -o $target -r $objects"
+    verbose -log "$prog $gccflags $command"
+    set status [remote_exec host [concat sh -c [list "$prog $gccflags $command 2>&1"]] "" "/dev/null" "ld.tmp"]
+    remote_upload host "ld.tmp"
+    set link_output [file_contents "ld.tmp"]
+    regsub "\n$" $link_output "" link_output
+    if { [lindex $status 0] != 0 && [string match "" $link_output] } then {
+	append link_output "child process exited abnormally"
+    }
+    remote_file build delete ld.tmp
+    remote_file host delete ld.tmp
 
-    catch "exec $ld $HOSTING_EMU -o $target -r $objects" exec_output
-    set exec_output [prune_warnings $exec_output]
+    if [string match "" $link_output] then {
+	return ""
+    }
+
+    verbose -log "$link_output"
+    return "$link_output"
+}
+
+proc run_host_cmd_yesno { prog command } {
+    global exec_output
+
+    set exec_output [prune_warnings [run_host_cmd "$prog" "$command"]]
     if [string match "" $exec_output] then {
-	return 1
-    } else {
-	verbose -log "$exec_output"
-	return 0
+	return 1;
     }
+    return 0;
+}
+
+# Link an object using relocation.
+#
+proc default_ld_relocate { ld target objects } {
+    global HOSTING_EMU
+
+    remote_file host delete $target
+    return [run_host_cmd_yesno "$ld" "$HOSTING_EMU -o $target -r $objects"]
 }
 
 # Check to see if ld is being invoked with a non-endian output format
@@ -114,18 +196,20 @@ proc big_or_little_endian {} {
 proc default_ld_link { ld target objects } {
     global HOSTING_EMU
     global HOSTING_CRT0
+    global HOSTING_SCRT0
     global HOSTING_LIBS
+    global HOSTING_SLIBS
     global LIBS
     global host_triplet
     global link_output
     global exec_output
 
-    set objs "$HOSTING_CRT0 $objects"
-    set libs "$LIBS $HOSTING_LIBS"
-
-    if { [which $ld] == 0 } then {
-	perror "$ld does not exist"
-	return 0
+    if { [ string match "* -pie *" $objects ] } {
+	set objs "$HOSTING_SCRT0 $objects"
+	set libs "$LIBS $HOSTING_SLIBS"
+    } else {
+	set objs "$HOSTING_CRT0 $objects"
+	set libs "$LIBS $HOSTING_LIBS"
     }
 
     if [is_endian_output_format $objects] then {
@@ -134,96 +218,61 @@ proc default_ld_link { ld target objects } {
 	set flags ""
     }
 
-    catch "exec rm -f $target" exec_output
-
-    verbose -log "$ld $HOSTING_EMU $flags -o $target $objs $libs"
+    remote_file host delete $target
 
-    catch "exec $ld $HOSTING_EMU $flags -o $target $objs $libs" link_output
-    set exec_output [prune_warnings $link_output]
-    if [string match "" $exec_output] then {
-	return 1
-    } else {
-	verbose -log "$exec_output"
-	return 0
-    }
+    return [run_host_cmd_yesno "$ld" "$HOSTING_EMU $flags -o $target $objs $libs"]
 }
 
 # Link a program using ld, without including any libraries.
 #
 proc default_ld_simple_link { ld target objects } {
     global host_triplet
-    global link_output
-    global gcc_ld_flag
     global exec_output
 
-    if { [which $ld] == 0 } then {
-	perror "$ld does not exist"
-	return 0
-    }
-
+    set flags ""
     if [is_endian_output_format $objects] then {
 	set flags [big_or_little_endian]
-    } else {
-	set flags ""
     }
 
-    # If we are compiling with gcc, we want to add gcc_ld_flag to
-    # flags.  Rather than determine this in some complex way, we guess
-    # based on the name of the compiler.
-    set ldexe $ld
-    set ldparm [string first " " $ld]
-    if { $ldparm > 0 } then {
-	set ldexe [string range $ld 0 $ldparm]
-    }
-    set ldexe [string replace $ldexe 0 [string last "/" $ldexe] ""]
-    if {[string match "*gcc*" $ldexe] || [string match "*++*" $ldexe]} then {
-	set flags "$gcc_ld_flag $flags"
-    }
-
-    catch "exec rm -f $target" exec_output
-
-    verbose -log "$ld $flags -o $target $objects"
-
-    catch "exec $ld $flags -o $target $objects" link_output
-    set exec_output [prune_warnings $link_output]
+    remote_file host delete $target
+    set exec_output [run_host_cmd "$ld" "$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
     # symbol, since the default linker script might use ENTRY.
     regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
 
-    if [string match "" $exec_output] then {
-	return 1
-    } else {
-	verbose -log "$exec_output"
-	return 0
-    }
+    return [string match "" $exec_output]
 }
 
 # Compile an object using cc.
 #
 proc default_ld_compile { cc source object } {
     global CFLAGS
+    global CXXFLAGS
     global srcdir
     global subdir
     global host_triplet
-    global gcc_gas_flag
+    global gcc_B_opt
 
     set cc_prog $cc
     if {[llength $cc_prog] > 1} then {
 	set cc_prog [lindex $cc_prog 0]
     }
-    if {[which $cc_prog] == 0} then {
+    if {![is_remote host] && [which $cc_prog] == 0} then {
 	perror "$cc_prog does not exist"
 	return 0
     }
 
-    catch "exec rm -f $object" exec_output
+    remote_file build delete "$object"
+    remote_file host delete "$object"
 
-    set flags "-I$srcdir/$subdir $CFLAGS"
+    set flags "$gcc_B_opt -I$srcdir/$subdir"
 
-    # If we are compiling with gcc, we want to add gcc_gas_flag to
-    # flags.  Rather than determine this in some complex way, we guess
-    # based on the name of the compiler.
+    # If we are compiling with gcc, we want to add gcc_B_opt to flags.
+    # However, if $prog already has -B options, which might be the
+    # case when running gcc out of a build directory, we want our -B
+    # options to come first.
     set ccexe $cc
     set ccparm [string first " " $cc]
     set ccflags ""
@@ -232,33 +281,39 @@ proc default_ld_compile { cc source object } {
 	set ccexe [string range $cc 0 $ccparm]
 	set cc $ccexe
     }
+
     set ccexe [string replace $ccexe 0 [string last "/" $ccexe] ""]
-    if {[string match "*gcc*" $ccexe] || [string match "*++*" $ccexe]} then {
-	set flags "$gcc_gas_flag $flags"
+    if {[string match "*++*" $ccexe]} {
+	append flags " $CXXFLAGS"
+    } else {
+	append flags " $CFLAGS"
+    }
+
+    if [board_info [target_info name] exists cflags] {
+        append flags " [board_info [target_info name] cflags]"
     }
 
     if [board_info [target_info name] exists multilib_flags] {
 	append flags " [board_info [target_info name] multilib_flags]"
     }
 
-    verbose -log "$cc $flags $ccflags -c $source -o $object"
+    set cmd "$cc $flags $ccflags -c $source -o $object"
+    verbose -log "$cmd"
 
-    catch "exec $cc $flags $ccflags -c $source -o $object" exec_output
+    set status [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"]
+    remote_upload host "ld.tmp"
+    set exec_output [file_contents "ld.tmp"]
+    remote_file build delete "ld.tmp"
+    remote_file host delete "ld.tmp"
     set exec_output [prune_warnings $exec_output]
     if [string match "" $exec_output] then {
 	if {![file exists $object]} then {
 	    regexp ".*/(\[^/\]*)$" $source all dobj
 	    regsub "\\.c" $dobj ".o" realobj
 	    verbose "looking for $realobj"
-	    if {[file exists $realobj]} then {
+	    if {[remote_file host exists $realobj]} then {
 		verbose -log "mv $realobj $object"
-		catch "exec mv $realobj $object" exec_output
-		set exec_output [prune_warnings $exec_output]
-		if {![string match "" $exec_output]} then {
-		    verbose -log "$exec_output"
-		    perror "could not move $realobj to $object"
-		    return 0
-		}
+		remote_upload "$realobj" "$object"
 	    } else {
 		perror "$object not found after compilation"
 		return 0
@@ -274,27 +329,20 @@ proc default_ld_compile { cc source object } {
 
 # Assemble a file.
 #
-proc default_ld_assemble { as source object } {
+proc default_ld_assemble { as in_flags source object } {
     global ASFLAGS
     global host_triplet
-
-    if {[which $as] == 0} then {
-	perror "$as does not exist"
-	return 0
-    }
+    global srcdir
+    global subdir
 
     if ![info exists ASFLAGS] { set ASFLAGS "" }
 
-    set flags [big_or_little_endian]
-
-    verbose -log "$as $flags $ASFLAGS -o $object $source"
-
-    catch "exec $as $flags $ASFLAGS -o $object $source" exec_output
+    set flags "[big_or_little_endian] -I$srcdir/$subdir"
+    set exec_output [run_host_cmd "$as" "$flags $in_flags $ASFLAGS -o $object $source"]
     set exec_output [prune_warnings $exec_output]
     if [string match "" $exec_output] then {
 	return 1
     } else {
-	verbose -log "$exec_output"
 	perror "$source: assembly failed"
 	return 0
     }
@@ -307,11 +355,6 @@ proc default_ld_nm { nm nmflags object } {
     global nm_output
     global host_triplet
 
-    if {[which $nm] == 0} then {
-	perror "$nm does not exist"
-	return 0
-    }
-
     if {[info exists nm_output]} {
       unset nm_output
     }
@@ -323,15 +366,20 @@ proc default_ld_nm { nm nmflags object } {
 	set old_lc_all $env(LC_ALL)
     }
     set env(LC_ALL) "C"
+
     verbose -log "$nm $NMFLAGS $nmflags $object >tmpdir/nm.out"
 
-    catch "exec $nm $NMFLAGS $nmflags $object >tmpdir/nm.out" exec_output
+    set status [remote_exec host [concat sh -c [list "$nm $NMFLAGS $nmflags $object 2>ld.stderr"]] "" "/dev/null" "tmpdir/nm.out"]
     if {[info exists old_lc_all]} {
 	set env(LC_ALL) $old_lc_all
     } else {
 	unset env(LC_ALL)
     }
-    set exec_output [prune_warnings $exec_output]
+    remote_upload host "ld.stderr"
+    remote_upload host "tmpdir/nm.out" "tmpdir/nm.out"
+    set exec_output [prune_warnings [file_contents "ld.stderr"]]
+    remote_file host delete "ld.stderr"
+    remote_file build delete "ld.stderr"
     if [string match "" $exec_output] then {
 	set file [open tmpdir/nm.out r]
 	while { [gets $file line] != -1 } {
@@ -351,178 +399,50 @@ proc default_ld_nm { nm nmflags object } {
     }
 }
 
-# True if the object format is known to be ELF.
-#
-proc is_elf_format {} {
-    if { ![istarget *-*-sysv4*] \
-	 && ![istarget *-*-unixware*] \
-	 && ![istarget *-*-elf*] \
-	 && ![istarget *-*-eabi*] \
-	 && ![istarget hppa*64*-*-hpux*] \
-	 && ![istarget *-*-linux*] \
-	 && ![istarget frv-*-uclinux*] \
-	 && ![istarget *-*-irix5*] \
-	 && ![istarget *-*-irix6*] \
-	 && ![istarget *-*-netbsd*] \
-	 && ![istarget *-*-solaris2*] } {
-	return 0
-    }
+# Define various symbols needed when not linking against all
+# target libs.
+proc ld_simple_link_defsyms {} {
 
-    if { [istarget *-*-linux*aout*] \
-	 || [istarget *-*-linux*oldld*] } {
-	return 0
-    }
+    set flags "--defsym __stack_chk_fail=0"
 
-    if { ![istarget *-*-netbsdelf*] \
-	 && ([istarget *-*-netbsd*aout*] \
-	     || [istarget *-*-netbsdpe*] \
-	     || [istarget arm*-*-netbsd*] \
-	     || [istarget sparc-*-netbsd*] \
-	     || [istarget i*86-*-netbsd*] \
-	     || [istarget m68*-*-netbsd*] \
-	     || [istarget vax-*-netbsd*] \
-	     || [istarget ns32k-*-netbsd*]) } {
-    	return 0
+    # ARM targets call __gccmain
+    if {[istarget arm*-*-*]} {
+        append flags " --defsym __gccmain=0"
     }
-    return 1
-}
 
-# True if the object format is known to be 64-bit ELF.
-#
-proc is_elf64 { binary_file } {
-    global READELF
-    global READELFFLAGS
-
-    set readelf_size ""
-    catch "exec $READELF $READELFFLAGS -h $binary_file > readelf.out" got
-
-    if ![string match "" $got] then {
-	return 0
+    # Windows targets need __main, some prefixed with underscore.
+    if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*]} {
+        append flags " --defsym __main=0 --defsym ___main=0"
     }
 
-    if { ![regexp "\n\[ \]*Class:\[ \]*ELF(\[0-9\]+)\n" \
-	   [file_contents readelf.out] nil readelf_size] } {
-	return 0
+    # PowerPC EABI code calls __eabi.
+    if {[istarget powerpc*-*-eabi*] || [istarget powerpc*-*-rtems*]} {
+	append flags " --defsym __eabi=0"
     }
 
-    if { $readelf_size == "64" } {
-	return 1
+    # mn10200 code calls __truncsipsi2_d0_d2.
+    if {[istarget mn10200*-*-*]} then {
+	append flags " --defsym __truncsipsi2_d0_d2=0"
     }
 
-    return 0
-}
-
-# True if the object format is known to be a.out.
-#
-proc is_aout_format {} {
-    if { [istarget *-*-*\[ab\]out*] \
-	     || [istarget *-*-linux*oldld*] \
-	     || [istarget *-*-msdos*] \
-	     || [istarget arm-*-netbsd] \
-	     || [istarget i?86-*-netbsd] \
-	     || [istarget i?86-*-mach*] \
-	     || [istarget i?86-*-vsta] \
-	     || [istarget pdp11-*-*] \
-	     || [istarget m68*-ericsson-ose] \
-	     || [istarget m68k-hp-bsd*] \
-	     || [istarget m68*-*-hpux*] \
-	     || [istarget m68*-*-netbsd] \
-	     || [istarget m68*-*-netbsd*4k*] \
-	     || [istarget m68k-sony-*] \
-	     || [istarget m68*-sun-sunos\[34\]*] \
-	     || [istarget m68*-wrs-vxworks*] \
-	     || [istarget ns32k-*-*] \
-	     || [istarget sparc*-*-netbsd] \
-	     || [istarget sparc-sun-sunos4*] \
-	     || [istarget vax-dec-ultrix*] \
-	     || [istarget vax-*-netbsd] } {
-	return 1
+    # m6811/m6812 code has references to soft registers.
+    if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} {
+	append flags " --defsym _.frame=0 --defsym _.d1=0 --defsym _.d2=0"
+	append flags " --defsym _.d3=0 --defsym _.d4=0"
+	append flags " --defsym _.tmp=0 --defsym _.xy=0 --defsym _.z=0"
     }
-    return 0
-}
 
-# True if the object format is known to be PE COFF.
-#
-proc is_pecoff_format {} {
-    if { ![istarget *-*-mingw*] \
-	 && ![istarget *-*-cygwin*] \
-	 && ![istarget *-*-pe*] } {
-	return 0
-    }
-
-    return 1
-}
-
-# Compares two files line-by-line.
-#   Returns differences if exist.
-#   Returns null if file(s) cannot be opened.
-#
-proc simple_diff { file_1 file_2 } {
-    global target
-
-    set eof -1
-    set differences 0
-
-    if [file exists $file_1] then {
-	set file_a [open $file_1 r]
-    } else {
-	warning "$file_1 doesn't exist"
-	return
+    # Some OpenBSD targets have ProPolice and reference __guard and
+    # __stack_smash_handler.
+    if [istarget *-*-openbsd*] {
+	append flags " --defsym __guard=0"
+	append flags " --defsym __stack_smash_handler=0"
     }
 
-    if [file exists $file_2] then {
-	set file_b [open $file_2 r]
-    } else {
-	fail "$file_2 doesn't exist"
-	return
-    }
-
-    verbose "# Diff'ing: $file_1 $file_2\n" 2
-
-    while { [gets $file_a line] != $eof } {
-	if [regexp "^#.*$" $line] then {
-	    continue
-	} else {
-	    lappend list_a $line
-	}
-    }
-    close $file_a
-
-    while { [gets $file_b line] != $eof } {
-	if [regexp "^#.*$" $line] then {
-	    continue
-	} else {
-	    lappend list_b $line
-	}
-    }
-    close $file_b
-
-    for { set i 0 } { $i < [llength $list_a] } { incr i } {
-	set line_a [lindex $list_a $i]
-	set line_b [lindex $list_b $i]
-
-	verbose "\t$file_1: $i: $line_a\n" 3
-	verbose "\t$file_2: $i: $line_b\n" 3
-	if [string compare $line_a $line_b] then {
-	    verbose -log "\t$file_1: $i: $line_a\n"
-	    verbose -log "\t$file_2: $i: $line_b\n"
-
-	    fail "Test: $target"
-	    return
-	}
-    }
-
-    if { [llength $list_a] != [llength $list_b] } {
-	fail "Test: $target"
-	return
-    }
-
-    if $differences<1 then {
-	pass "Test: $target"
-    }
+    return $flags
 }
 
-# run_dump_test FILE
+# run_dump_test FILE (optional:) EXTRA_OPTIONS
 # Copied from gas testsuite, tweaked and further extended.
 #
 # Assemble a .s file, then run some utility on it and check the output.
@@ -547,6 +467,12 @@ proc simple_diff { file_1 file_2 } {
 # list ends with the first line that doesn't match the above syntax
 # (hmm, not great for error detection).
 #
+# The optional EXTRA_OPTIONS argument to `run_dump_test' is a list of
+# two-element lists.  The first element of each is an option name, and
+# the second additional arguments to be added on to the end of the
+# option list as given in FILE.d.  (If omitted, no additional options
+# are added.)
+#
 # The interesting options are:
 #
 #   name: TEST-NAME
@@ -563,6 +489,14 @@ proc simple_diff { file_1 file_2 } {
 #       Link assembled files using FLAGS, in the order of the "source"
 #       directives, when using multiple files.
 #
+#   ld_after_inputfiles: FLAGS
+#       Similar to "ld", but put after all input files.
+#
+#   objcopy_objects: FLAGS
+#	Run objcopy with the specified flags after assembling any source
+#	that has the special marker RUN_OBJCOPY in the source specific
+#	flags.
+#
 #   objcopy_linked_file: FLAGS
 #	Run objcopy on the linked file with the specified flags.
 #	This lets you transform the linked file using objcopy, before the
@@ -591,13 +525,19 @@ proc simple_diff { file_1 file_2 } {
 #       More than one "source" directive can be given, which is useful
 #       when testing linking.
 #
+#   dump: DUMP
+#	Match against DUMP.d.  If omitted, this defaults to FILE.d.  This
+#	is useful if several .d files differ by options only.  Options are
+#	always read from FILE.d.
+#
 #   xfail: TARGET
 #       The test is expected to fail on TARGET.  This may occur more than
 #       once.
 #
 #   target: TARGET
 #       Only run the test for TARGET.  This may occur more than once; the
-#       target being tested must match at least one.
+#       target being tested must match at least one.  You may provide target
+#       name "cfi" for any target supporting the CFI statements.
 #
 #   notarget: TARGET
 #       Do not run the test for TARGET.  This may occur more than once;
@@ -606,25 +546,27 @@ 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.
 #
 # After the option lines come regexp lines.  `run_dump_test' calls
 # `regexp_diff' to compare the output of the dumping tool against the
-# regexps in FILE.d.  `regexp_diff' is defined later in this file; see
-# further comments there.
+# regexps in FILE.d.  `regexp_diff' is defined in binutils-common.exp;
+# see further comments there.
 #
-proc run_dump_test { name } {
+proc run_dump_test { name {extra_options {}} } {
     global subdir srcdir
     global OBJDUMP NM AS OBJCOPY READELF LD
     global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS
     global host_triplet runtests
-    global env
+    global env verbose
 
     if [string match "*/*" $name] {
 	set file $name
@@ -648,6 +590,7 @@ proc run_dump_test { name } {
     set run_objcopy 0
     set opts(as) {}
     set opts(ld) {}
+    set opts(ld_after_inputfiles) {}
     set opts(xfail) {}
     set opts(target) {}
     set opts(notarget) {}
@@ -658,10 +601,11 @@ proc run_dump_test { name } {
     set opts(name) {}
     set opts(PROG) {}
     set opts(source) {}
+    set opts(dump) {}
     set opts(error) {}
     set opts(warning) {}
     set opts(objcopy_linked_file) {}
-    set asflags(${file}.s) {}
+    set opts(objcopy_objects) {}
 
     foreach i $opt_array {
 	set opt_name [lindex $i 0]
@@ -676,14 +620,16 @@ proc run_dump_test { name } {
 	    xfail {}
 	    target {}
 	    notarget {}
+	    warning {}
+	    error {}
 	    source {
-		# Move any source-specific as-flags to a separate array to
+		# Move any source-specific as-flags to a separate list to
 		# simplify processing.
 		if { [llength $opt_val] > 1 } {
-		    set asflags([lindex $opt_val 0]) [lrange $opt_val 1 end]
+		    lappend asflags [lrange $opt_val 1 end]
 		    set opt_val [lindex $opt_val 0]
 		} else {
-		    set asflags($opt_val) {}
+		    lappend asflags {}
 		}
 	    }
 	    default {
@@ -703,7 +649,43 @@ proc run_dump_test { name } {
 		}
 	    }
 	}
-	set opts($opt_name) [concat $opts($opt_name) $opt_val]
+	if { $opt_name == "as" || $opt_name == "ld" } {
+	    set opt_val [subst $opt_val]
+	}
+
+	# Append differently whether it's a message (without space) or
+	# an option or list (with space).
+	switch -- $opt_name {
+	    warning -
+	    error {
+		append opts($opt_name) $opt_val
+	    }
+	    default {
+		set opts($opt_name) [concat $opts($opt_name) $opt_val]
+	    }
+	}
+    }
+
+    foreach i $extra_options {
+	set opt_name [lindex $i 0]
+	set opt_val [lindex $i 1]
+	if ![info exists opts($opt_name)] {
+	    perror "unknown option $opt_name given in extra_opts"
+	    unresolved $subdir/$name
+	    return
+	}
+	# Add extra option to end of existing option, adding space
+	# if necessary.
+	if { ![regexp "warning|error" $opt_name]
+	     && [string length $opts($opt_name)] } {
+	    append opts($opt_name) " "
+	}
+	append opts($opt_name) $opt_val
+    }
+
+    foreach opt { as ld } {
+	regsub {\[big_or_little_endian\]} $opts($opt) \
+	    [big_or_little_endian] opts($opt)
     }
 
     # Decide early whether we should run the test for this target.
@@ -769,6 +751,7 @@ proc run_dump_test { name } {
 
     if { $opts(source) == "" } {
 	set sourcefiles [list ${file}.s]
+	set asflags [list ""]
     } else {
 	set sourcefiles {}
 	foreach sf $opts(source) {
@@ -777,11 +760,21 @@ proc run_dump_test { name } {
 	    } else {
 		lappend sourcefiles "$srcdir/$subdir/$sf"
 	    }
-	    # Must have asflags indexed on source name.
-	    set asflags($srcdir/$subdir/$sf) $asflags($sf)
 	}
     }
 
+    if { $opts(dump) == "" } {
+	set dfile ${file}.d
+    } else {
+	set dfile $srcdir/$subdir/$opts(dump)
+    }
+
+    if { [string match "*--compress-debug-sections*" $opts(as)] \
+	 && ![is_zlib_supported] } {
+	unsupported $testname
+	return
+    }
+
     # Time to setup xfailures.
     foreach targ $opts(xfail) {
 	setup_xfail $targ
@@ -791,17 +784,27 @@ proc run_dump_test { name } {
     set objfiles {}
     for { set i 0 } { $i < [llength $sourcefiles] } { incr i } {
 	set sourcefile [lindex $sourcefiles $i]
+	set sourceasflags [lindex $asflags $i]
+	set run_objcopy_objects 0
+
+	if { [string match "*RUN_OBJCOPY*" $sourceasflags] } {
+	    set run_objcopy_objects 1
+	}
+	regsub "RUN_OBJCOPY" $sourceasflags "" sourceasflags
 
 	set objfile "tmpdir/dump$i.o"
 	catch "exec rm -f $objfile" exec_output
 	lappend objfiles $objfile
-	set cmd "$AS $ASFLAGS $opts(as) $asflags($sourcefile) -o $objfile $sourcefile"
+	set cmd "$AS $ASFLAGS $opts(as) $sourceasflags -o $objfile $sourcefile"
 
 	send_log "$cmd\n"
-	set cmdret [catch "exec $cmd" comp_output]
-	set comp_output [prune_warnings $comp_output]
+	set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"]
+	remote_upload host "ld.tmp"
+	set comp_output [prune_warnings [file_contents "ld.tmp"]]
+	remote_file host delete "ld.tmp"
+	remote_file build delete "ld.tmp"
 
-	if { $cmdret != 0 || ![string match "" $comp_output] } then {
+	if { [lindex $cmdret 0] != 0 || ![string match "" $comp_output] } then {
 	    send_log "$comp_output\n"
 	    verbose "$comp_output" 3
 
@@ -811,6 +814,30 @@ proc run_dump_test { name } {
 	    fail $testname
 	    return
 	}
+
+	if { $run_objcopy_objects } {
+	    set cmd "$OBJCOPY $opts(objcopy_objects) $objfile"
+
+	    send_log "$cmd\n"
+	    set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] \
+			"" "/dev/null" "objcopy.tmp"]
+	    remote_upload host "objcopy.tmp"
+	    set comp_output [prune_warnings [file_contents "objcopy.tmp"]]
+	    remote_file host delete "objcopy.tmp"
+	    remote_file build delete "objcopy.tmp"
+
+	    if { [lindex $cmdret 0] != 0 \
+		  || ![string match "" $comp_output] } {
+		send_log "$comp_output\n"
+		verbose "$comp_output" 3
+
+		set exitstat "succeeded"
+		if { $cmdret != 0 } { set exitstat "failed" }
+		verbose -log "$exitstat with: <$comp_output>"
+		fail $testname
+		return
+	    }
+	}
     }
 
     set expmsg $opts(error)
@@ -830,46 +857,35 @@ proc run_dump_test { name } {
 	# Add -L$srcdir/$subdir so that the linker command can use
 	# linker scripts in the source directory.
 	set cmd "$LD $LDFLAGS -L$srcdir/$subdir \
-		   $opts(ld) -o $objfile $objfiles"
+		   $opts(ld) -o $objfile $objfiles $opts(ld_after_inputfiles)"
 
 	send_log "$cmd\n"
-	set cmdret [catch "exec $cmd" comp_output]
-	set comp_output [prune_warnings $comp_output]
-
-	if { $cmdret != 0 } then {
-	    # If the executed program writes to stderr and stderr is not
-	    # redirected, exec *always* returns failure, regardless of the
-	    # program exit code.  Thankfully, we can retrieve the true
-	    # return status from a special variable.  Redirection would
-	    # cause a Tcl-specific message to be appended, and we'd rather
-	    # not deal with that if we can help it.
-	    global errorCode
-	    if { [lindex $errorCode 0] == "NONE" } {
-		set cmdret 0
-	    }
-	}
+	set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"]
+	remote_upload host "ld.tmp"
+	set comp_output [file_contents "ld.tmp"]
+	remote_file host delete "ld.tmp"
+	remote_file build delete "ld.tmp"
+	set cmdret [lindex $cmdret 0]
 
 	if { $cmdret == 0 && $run_objcopy } {
 	    set infile $objfile
 	    set objfile "tmpdir/dump1"
-	    catch "exec rm -f $objfile" exec_output
+	    remote_file host delete $objfile
 
 	    # Note that we don't use OBJCOPYFLAGS here; any flags must be
 	    # explicitly specified.
 	    set cmd "$OBJCOPY $opts(objcopy_linked_file) $infile $objfile"
 
 	    send_log "$cmd\n"
-	    set cmdret [catch "exec $cmd" comp_output]
-	    append comp_output [prune_warnings $comp_output]
-
-	    if { $cmdret != 0 } then {
-		global errorCode
-		if { [lindex $errorCode 0] == "NONE" } {
-		    set cmdret 0
-		}
-	    }
+	    set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"]
+	    remote_upload host "ld.tmp"
+	    append comp_output [file_contents "ld.tmp"]
+	    remote_file host delete "ld.tmp"
+	    remote_file build delete "ld.tmp"
+	    set cmdret [lindex $cmdret 0]
 	}
 
+	regsub "\n$" $comp_output "" comp_output
 	if { $cmdret != 0 || $comp_output != "" || $expmsg != "" } then {
 	    set exitstat "succeeded"
 	    if { $cmdret != 0 } { set exitstat "failed" }
@@ -877,8 +893,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
@@ -904,7 +921,7 @@ proc run_dump_test { name } {
     eval set progopts \$[string toupper $program]FLAGS
     eval set binary \$[string toupper $program]
 
-    if { [which $binary] == 0 } {
+    if { ![is_remote host] && [which $binary] == 0 } {
 	untested $testname
 	return
     }
@@ -925,23 +942,27 @@ proc run_dump_test { name } {
     }
     set env(LC_ALL) "C"
     send_log "$cmd\n"
-    catch "exec $cmd" comp_output
+    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"
+    remote_file build delete "ld.tmp"
     if {[info exists old_lc_all]} {
 	set env(LC_ALL) $old_lc_all
     } else {
 	unset env(LC_ALL)
     }
-    set comp_output [prune_warnings $comp_output]
-    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
     }
 
-    verbose_eval {[file_contents $dumpfile]} 3
-    if { [regexp_diff $dumpfile "${file}.d"] } then {
+    if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 }
+    if { [regexp_diff $dumpfile "${dfile}"] } then {
 	fail $testname
-	verbose "output is [file_contents $dumpfile]" 2
+	if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 }
 	return
     }
 
@@ -949,6 +970,10 @@ proc run_dump_test { name } {
 }
 
 proc slurp_options { file } {
+    # If options_regsub(foo) is set to {a b}, then the contents of a
+    # "#foo:" line will have regsub -all applied to replace a with b.
+    global options_regsub
+
     if [catch { set f [open $file r] } x] {
 	#perror "couldn't open `$file': $x"
 	perror "$x"
@@ -966,6 +991,11 @@ proc slurp_options { file } {
 	# Whitespace here is space-tab.
 	if [regexp $pat $line xxx opt_name opt_val] {
 	    # match!
+	    if [info exists options_regsub($opt_name)] {
+		set subst $options_regsub($opt_name)
+		regsub -all -- [lindex $subst 0] $opt_val [lindex $subst 1] \
+		    opt_val
+	    }
 	    lappend opt_array [list $opt_name $opt_val]
 	} else {
 	    break
@@ -975,131 +1005,62 @@ proc slurp_options { file } {
     return $opt_array
 }
 
-# regexp_diff, copied from gas, based on simple_diff above.
-#	compares two files line-by-line
-#	file1 contains strings, file2 contains regexps and #-comments
-#	blank lines are ignored in either file
-#	returns non-zero if differences exist
+proc file_contents { filename } {
+    set file [open $filename r]
+    set contents [read $file]
+    close $file
+    return $contents
+}
+
+proc set_file_contents { filename contents } {
+    set file [open $filename w]
+    puts $file "$contents"
+    close $file
+}
+
+# Create an archive using ar
 #
-proc regexp_diff { file_1 file_2 } {
+proc ar_simple_create { ar aropts target objects } {
+    remote_file host delete $target
 
-    set eof -1
-    set end_1 0
-    set end_2 0
-    set differences 0
-    set diff_pass 0
+    set exec_output [run_host_cmd "$ar" "$aropts -rc $target $objects"]
+    set exec_output [prune_warnings $exec_output]
 
-    if [file exists $file_1] then {
-	set file_a [open $file_1 r]
-    } else {
-	warning "$file_1 doesn't exist"
+    if [string match "" $exec_output] then {
+	send_log "$exec_output\n"
 	return 1
-    }
-
-    if [file exists $file_2] then {
-	set file_b [open $file_2 r]
     } else {
-	fail "$file_2 doesn't exist"
-	close $file_a
-	return 1
+	return 0
     }
-
-    verbose " Regexp-diff'ing: $file_1 $file_2" 2
-
-    while { 1 } {
-	set line_a ""
-	set line_b ""
-	while { [string length $line_a] == 0 } {
-	    if { [gets $file_a line_a] == $eof } {
-		set end_1 1
-		break
-	    }
-	}
-	while { [string length $line_b] == 0 || [string match "#*" $line_b] } {
-	    if [ string match "#pass" $line_b ] {
-		set end_2 1
-		set diff_pass 1
-		break
-	    } elseif [ string match "#..." $line_b ] {
-		if { [gets $file_b line_b] == $eof } {
-		    set end_2 1
-		    set diff_pass 1
-		    break
-		}
-		verbose "looking for \"^$line_b$\"" 3
-		while { ![regexp "^$line_b$" "$line_a"] } {
-		    verbose "skipping    \"$line_a\"" 3
-		    if { [gets $file_a line_a] == $eof } {
-			set end_1 1
-			break
-		    }
-		}
-		break
-	    }
-	    if { [gets $file_b line_b] == $eof } {
-		set end_2 1
-		break
-	    }
-	}
-
-        if { $diff_pass } {
-            break
-        } elseif { $end_1 && $end_2 } {
-            break
-        } elseif { $end_1 } {
-            send_log "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1\n"
-            verbose "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1" 3
-            set differences 1
-            break
-        } elseif { $end_2 } {
-            send_log "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n"
-            verbose "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n" 3
-            set differences 1
-            break
-        } else {
-            verbose "regexp \"^$line_b$\"\nline   \"$line_a\"" 3
-            if ![regexp "^$line_b$" "$line_a"] {
-		send_log "regexp_diff match failure\n"
-		send_log "regexp \"^$line_b$\"\nline   \"$line_a\"\n"
-		set differences 1
-            }
-        }
-    }
-
-    if { $differences == 0 && !$diff_pass && [eof $file_a] != [eof $file_b] } {
-	send_log "$file_1 and $file_2 are different lengths\n"
-	verbose "$file_1 and $file_2 are different lengths" 3
-	set differences 1
-    }
-
-    close $file_a
-    close $file_b
-
-    return $differences
-}
-
-proc file_contents { filename } {
-    set file [open $filename r]
-    set contents [read $file]
-    close $file
-    return $contents
 }
 
 # List contains test-items with 3 items followed by 2 lists, one item and
 # one optional item:
-# 0:name 1:ld options 2:assembler options
-# 3:filenames of assembler files 4: action and options. 5: name of output file
-# 6:compiler flags (optional)
+#  0:name
+#  1:ld/ar leading options, placed before object files
+#  2:ld/ar trailing options, placed after object files
+#  3:assembler options
+#  4:filenames of assembler files
+#  5:list of actions, options and expected outputs.
+#  6:name of output file
+#  7:compiler flags (optional)
 #
-# Actions:
-# objdump: Apply objdump options on result.  Compare with regex (last arg).
-# nm: Apply nm options on result.  Compare with regex (last arg).
-# readelf: Apply readelf options on result.  Compare with regex (last arg).
+# Actions: { command command-line-options file-containg-expected-output-regexps }
+# Commands:
+#   objdump: Apply objdump options on result.
+#   nm: Apply nm options on result.
+#   readelf: Apply readelf options on result.
+#   ld: Don't apply anything on result.  Compare output during linking with
+#     the file containing regexps (which is the second arg, not the third).
+#     Note that this *must* be the first action if it is to be used at all;
+#     in all other cases, any output from the linker during linking is
+#     treated as a sign of an error and FAILs the test.
 #
 proc run_ld_link_tests { ldtests } {
     global ld
     global as
     global nm
+    global ar
     global objdump
     global READELF
     global srcdir
@@ -1107,21 +1068,32 @@ proc run_ld_link_tests { ldtests } {
     global env
     global CC
     global CFLAGS
+    global runtests
+    global exec_output
 
     foreach testitem $ldtests {
 	set testname [lindex $testitem 0]
+
+	if ![runtest_file_p $runtests $testname] then {
+	    continue
+	}
+
 	set ld_options [lindex $testitem 1]
-	set as_options [lindex $testitem 2]
-	set src_files  [lindex $testitem 3]
-	set actions [lindex $testitem 4]
-	set binfile tmpdir/[lindex $testitem 5]
-	set cflags [lindex $testitem 6]
+	set ld_after [lindex $testitem 2]
+	set as_options [lindex $testitem 3]
+	set src_files  [lindex $testitem 4]
+	set actions [lindex $testitem 5]
+	set binfile tmpdir/[lindex $testitem 6]
+	set cflags [lindex $testitem 7]
 	set objfiles {}
 	set is_unresolved 0
 	set failed 0
+	set maybe_failed 0
+	set ld_output ""
 
 #	verbose -log "Testname is $testname"
 #	verbose -log "ld_options is $ld_options"
+#	verbose -log "ld_after is $ld_after"
 #	verbose -log "as_options is $as_options"
 #	verbose -log "src_files is $src_files"
 #	verbose -log "actions is $actions"
@@ -1129,11 +1101,12 @@ proc run_ld_link_tests { ldtests } {
 
 	# Assemble each file in the test.
 	foreach src_file $src_files {
-	    set objfile "tmpdir/[file rootname $src_file].o"
+	    set fileroot "[file rootname [file tail $src_file]]"
+	    set objfile "tmpdir/$fileroot.o"
 	    lappend objfiles $objfile
 
 	    if { [file extension $src_file] == ".c" } {
-		set as_file "tmpdir/[file rootname $src_file].s"
+		set as_file "tmpdir/$fileroot.s"
 		if ![ld_compile "$CC -S $CFLAGS $cflags" $srcdir/$subdir/$src_file $as_file] {
 		    set is_unresolved 1
 		    break
@@ -1148,15 +1121,23 @@ proc run_ld_link_tests { ldtests } {
 	}
 
 	# Catch assembler errors.
-	if { $is_unresolved != 0 } {
+	if { $is_unresolved } {
 	    unresolved $testname
 	    continue
 	}
 
-	if ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
-	    fail $testname
-	} else {
-	    set failed 0
+	if { $binfile eq "tmpdir/" } {
+	    # compile only
+	} elseif { [regexp ".*\\.a$" $binfile] } {
+	    if { ![ar_simple_create $ar $ld_options $binfile "$objfiles $ld_after"] } {
+		set failed 1
+	    }
+	} elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles $ld_after"] } {
+	    set maybe_failed 1
+	    set ld_output "$exec_output"
+	}
+
+	if { !$failed } {
 	    foreach actionlist $actions {
 		set action [lindex $actionlist 0]
 		set progopts [lindex $actionlist 1]
@@ -1172,6 +1153,8 @@ proc run_ld_link_tests { ldtests } {
 		        { set dump_prog $nm }
 		    readelf
 		        { set dump_prog $READELF }
+		    ld
+		        { set dump_prog "ld" }
 		    default
 			{
 			    perror "Unrecognized action $action"
@@ -1180,7 +1163,18 @@ proc run_ld_link_tests { ldtests } {
 			}
 		    }
 
-		if { $dump_prog != "" } {
+		if { $action == "ld" } {
+		    set regexpfile $progopts
+		    verbose "regexpfile is $srcdir/$subdir/$regexpfile"
+		    set_file_contents "tmpdir/ld.messages" "$ld_output"
+		    verbose "ld.messages has '[file_contents tmpdir/ld.messages]'"
+		    if { [regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$regexpfile"] } then {
+			verbose "output is $ld_output" 2
+			set failed 1
+			break
+		    }
+		    set maybe_failed 0
+		} elseif { !$maybe_failed && $dump_prog != "" } {
 		    set dumpfile [lindex $actionlist 2]
 		    set binary $dump_prog
 
@@ -1189,15 +1183,19 @@ proc run_ld_link_tests { ldtests } {
 			set old_lc_all $env(LC_ALL)
 		    }
 		    set env(LC_ALL) "C"
-		    set cmd "$binary $progopts $binfile > dump.out"
+		    set cmd "$binary $progopts $binfile"
+    		    set status [remote_exec host [concat sh -c [list "$cmd >dump.out 2>ld.stderr"]] "" "/dev/null"]
 		    send_log "$cmd\n"
-		    catch "exec $cmd" comp_output
+    		    remote_upload host "ld.stderr"
+    		    set comp_output [prune_warnings [file_contents "ld.stderr"]]
+    		    remote_file host delete "ld.stderr"
+    		    remote_file build delete "ld.stderr"
+
 		    if {[info exists old_lc_all]} {
 			set env(LC_ALL) $old_lc_all
 		    } else {
 			unset env(LC_ALL)
 		    }
-		    set comp_output [prune_warnings $comp_output]
 
 		    if ![string match "" $comp_output] then {
 			send_log "$comp_output\n"
@@ -1205,35 +1203,31 @@ proc run_ld_link_tests { ldtests } {
 			break
 		    }
 
+		    remote_upload host "dump.out"
+
 		    if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then {
 			verbose "output is [file_contents "dump.out"]" 2
 			set failed 1
+		   	remote_file build delete "dump.out"
+		   	remote_file host delete "dump.out"
 			break
 		    }
+		    remote_file build delete "dump.out"
+		    remote_file host delete "dump.out"
 		}
 	    }
-
-	    if { $failed != 0 } {
-		fail $testname
-	    } else { if { $is_unresolved == 0 } {
-		pass $testname
-	    } }
 	}
 
-	# Catch action errors.
-	if { $is_unresolved != 0 } {
+	if { $is_unresolved } {
 	    unresolved $testname
-	    continue
+	} elseif { $maybe_failed || $failed } {
+	    fail $testname
+	} else {
+	    pass $testname
 	}
     }
 }
 
-
-proc verbose_eval { expr { level 1 } } {
-    global verbose
-    if $verbose>$level then { eval verbose "$expr" $level }
-}
-
 # This definition is taken from an unreleased version of DejaGnu.  Once
 # that version gets released, and has been out in the world for a few
 # months at least, it may be safe to delete this copy.
@@ -1279,6 +1273,7 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
     global CC
     global CXX
     global CFLAGS
+    global CXXFLAGS
     global errcnt
     global exec_output
 
@@ -1302,80 +1297,86 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
 #	verbose -log "ld_options is $ld_options"
 #	verbose -log "as_options is $as_options"
 #	verbose -log "src_files is $src_files"
-#	verbose -log "actions is $actions"
 #	verbose -log "binfile is $binfile"
 
 	# Assemble each file in the test.
 	foreach src_file $src_files {
-	    set objfile "tmpdir/[file rootname $src_file].o"
+	    set fileroot "[file rootname [file tail $src_file]]"
+	    set objfile "tmpdir/$fileroot.o"
 	    lappend objfiles $objfile
 
 	    # We ignore warnings since some compilers may generate
 	    # incorrect section attributes and the assembler will warn
 	    # them.
-	    ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
-
-	    # We have to use $CC to build PIE and shared library.
-	    if { [ string match "c" $lang ] } {
-		set link_proc ld_simple_link
-		set link_cmd $CC
-	    } elseif { [ string match "c++" $lang ] } {
-		set link_proc ld_simple_link
-		set link_cmd $CXX
-	    } elseif { [ string match "-shared" $ld_options ] \
-		 || [ string match "-pie" $ld_options ] } {
-		set link_proc ld_simple_link
-		set link_cmd $CC
+	    if { [ string match "c++" $lang ] } {
+		ld_compile "$CXX -c $CXXFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
 	    } else {
-		set link_proc ld_link
-		set link_cmd $ld
+		ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
 	    }
+	}
 
-	    if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
-		set failed 1
-	    } else {
+	# We have to use $CC to build PIE and shared library.
+	if { [ string match "c" $lang ] } {
+	    set link_proc ld_simple_link
+	    set link_cmd $CC
+	} elseif { [ string match "c++" $lang ] } {
+	    set link_proc ld_simple_link
+	    set link_cmd $CXX
+	} elseif { [ string match "-shared" $ld_options ] \
+		   || [ string match "-pie" $ld_options ] } {
+	    set link_proc ld_simple_link
+	    set link_cmd $CC
+	} else {
+	    set link_proc ld_link
+	    set link_cmd $ld
+	}
+
+	if { $binfile eq "tmpdir/" } {
+	    # compile only
+	    pass $testname
+	    continue;
+	} elseif ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
+	    set failed 1
+	}
+
+	# Check if exec_output is expected.
+	if { $warning != "" } then {
+	    verbose -log "returned with: <$exec_output>, expected: <$warning>"
+	    if { [regexp $warning $exec_output] } then {
 		set failed 0
+	    } else {
+		set failed 1
 	    }
+	}
 
-	    # Check if exec_output is expected.
-	    if { $warning != "" } then {
-		verbose -log "returned with: <$exec_output>, expected: <$warning>"
-		if { [regexp $warning $exec_output] } then {
-		    set failed 0
-		} else {
-		    set failed 1
-		}
-	    }
+	if { $failed == 0 } {
+	    send_log "Running: $binfile > $binfile.out\n"
+	    verbose "Running: $binfile > $binfile.out"
+	    catch "exec $binfile > $binfile.out" exec_output
+
+	    if ![string match "" $exec_output] then {
+		send_log "$exec_output\n"
+		verbose "$exec_output" 1
+		set failed 1
+	    } else {
+		send_log "diff $binfile.out $srcdir/$subdir/$expfile\n"
+		verbose "diff $binfile.out $srcdir/$subdir/$expfile"
+		catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output
+		set exec_output [prune_warnings $exec_output]
 
-	    if { $failed == 0 } {
-		send_log "Running: $binfile > $binfile.out\n"
-		verbose "Running: $binfile > $binfile.out"
-		catch "exec $binfile > $binfile.out" exec_output
-	    
 		if ![string match "" $exec_output] then {
 		    send_log "$exec_output\n"
 		    verbose "$exec_output" 1
 		    set failed 1
-		} else {
-		    send_log "diff $binfile.out $srcdir/$subdir/$expfile\n"
-		    verbose "diff $binfile.out $srcdir/$subdir/$expfile"
-		    catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output
-		    set exec_output [prune_warnings $exec_output]
-
-		    if ![string match "" $exec_output] then {
-			send_log "$exec_output\n"
-			verbose "$exec_output" 1
-			set failed 1
-		    }
 		}
 	    }
+	}
 
-	    if { $failed != 0 } {
-		fail $testname
-	    } else {
-		set errcnt 0
-		pass $testname
-	    }
+	if { $failed != 0 } {
+	    fail $testname
+	} else {
+	    set errcnt 0
+	    pass $testname
 	}
     }
 }
@@ -1383,12 +1384,13 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
 # List contains test-items with 3 items followed by 2 lists, one item and
 # one optional item:
 #  0:name
-#  1:link options
+#  1:ld or ar options
 #  2:compile options
 #  3:filenames of source files
 #  4:action and options.
 #  5:name of output file
 #  6:language (optional)
+#  7:linker warnings (optional)
 #
 # Actions:
 # objdump: Apply objdump options on result.  Compare with regex (last arg).
@@ -1405,6 +1407,9 @@ proc run_cc_link_tests { ldtests } {
     global CC
     global CXX
     global CFLAGS
+    global CXXFLAGS
+    global ar
+    global exec_output
 
     foreach testitem $ldtests {
 	set testname [lindex $testitem 0]
@@ -1414,19 +1419,34 @@ proc run_cc_link_tests { ldtests } {
 	set actions [lindex $testitem 4]
 	set binfile tmpdir/[lindex $testitem 5]
 	set lang [lindex $testitem 6]
+	set warnings [lindex $testitem 7]
 	set objfiles {}
 	set is_unresolved 0
 	set failed 0
 
+	#verbose -log "testname  is $testname"
+	#verbose -log "ldflags   is $ldflags"
+	#verbose -log "cflags    is $cflags"
+	#verbose -log "src_files is $src_files"
+	#verbose -log "actions   is $actions"
+	#verbose -log "binfile   is $binfile"
+	#verbose -log "lang      is $lang"
+	#verbose -log "warnings  is $warnings"
+
 	# Compile each file in the test.
 	foreach src_file $src_files {
-	    set objfile "tmpdir/[file rootname $src_file].o"
+	    set fileroot "[file rootname [file tail $src_file]]"
+	    set objfile "tmpdir/$fileroot.o"
 	    lappend objfiles $objfile
 
 	    # We ignore warnings since some compilers may generate
 	    # incorrect section attributes and the assembler will warn
 	    # them.
-	    ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
+	    if { [ string match "c++" $lang ] } {
+		ld_compile "$CXX -c $CXXFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
+	    } else {
+		ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
+	    }
 	}
 
 	# Clear error and warning counts.
@@ -1438,10 +1458,34 @@ proc run_cc_link_tests { ldtests } {
 	    set cc_cmd $CC
 	}
 
-	if ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] {
-	    fail $testname
+	if { $binfile eq "tmpdir/" } {
+	    # compile only
+	} elseif { [regexp ".*\\.a$" $binfile] } {
+	    if { ![ar_simple_create $ar $ldflags $binfile "$objfiles"] } {
+		fail $testname
+		set failed 1
+	    }
 	} else {
-	    set failed 0
+	    if { ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] } {
+		set failed 1
+	    }
+
+	    # Check if exec_output is expected.
+	    if { $warnings != "" } then {
+		verbose -log "returned with: <$exec_output>, expected: <$warnings>"
+		if { [regexp $warnings $exec_output] } then {
+		    set failed 0
+		} else {
+		    set failed 1
+		}
+	    }
+
+	    if { $failed == 1 } {
+		fail $testname
+	    }
+	}
+
+	if { $failed == 0 } {
 	    foreach actionlist $actions {
 		set action [lindex $actionlist 0]
 		set progopts [lindex $actionlist 1]
@@ -1497,18 +1541,286 @@ proc run_cc_link_tests { ldtests } {
 		    }
 		}
 	    }
-
-	    if { $failed != 0 } {
-		fail $testname
-	    } else { if { $is_unresolved == 0 } {
-		pass $testname
-	    } }
 	}
 
-	# Catch action errors.
-	if { $is_unresolved != 0 } {
+	if { $failed != 0 } {
+	    fail $testname
+	} elseif { $is_unresolved == 0 } {
+	    pass $testname
+	} else {
 	    unresolved $testname
 	    continue
 	}
     }
 }
+
+# Returns true if --gc-sections is supported on the target.
+
+proc check_gc_sections_available { } {
+    global gc_sections_available_saved
+    global ld
+
+    if {![info exists gc_sections_available_saved]} {
+	# Some targets don't support gc-sections despite whatever's
+	# advertised by ld's options.
+	if {   [istarget arc-*-*]
+	    || [istarget d30v-*-*]
+	    || [istarget dlx-*-*]
+	    || [istarget i960-*-*]
+	    || [istarget pj*-*-*]
+	    || [istarget alpha-*-*]
+	    || [istarget hppa*64-*-*]
+	    || [istarget i370-*-*]
+	    || [istarget i860-*-*]
+	    || [istarget ia64-*-*]
+	    || [istarget mep-*-*]
+	    || [istarget mn10200-*-*]
+	    || [istarget *-*-cygwin]
+	    || [istarget *-*-mingw*] } {
+	    set gc_sections_available_saved 0
+	    return 0
+	}
+
+	# elf2flt uses -q (--emit-relocs), which is incompatible with
+	# --gc-sections.
+	if { [board_info target exists ldflags]
+	     && [regexp " -elf2flt\[ =\]" " [board_info target ldflags] "] } {
+	    set gc_sections_available_saved 0
+	    return 0
+	}
+
+	# Check if the ld used by gcc supports --gc-sections.
+	# FIXME: this test is useless since ld --help always says
+	# --gc-sections is available
+	set ld_output [remote_exec host $ld "--help"]
+	if { [ string first "--gc-sections" $ld_output ] >= 0 } {
+	    set gc_sections_available_saved 1
+	} else {
+	    set gc_sections_available_saved 0
+	}
+    }
+    return $gc_sections_available_saved
+}
+
+# Returns true if -shared is supported on the target
+# Only used and accurate for ELF targets at the moment
+
+proc check_shared_lib_support { } {
+    if {![istarget aarch64*-*-elf]
+	 && ![istarget arc-*-*]
+	 && ![istarget arm*-*-elf]
+	 && ![istarget avr-*-*]
+	 && ![istarget cr16-*-*]
+	 && ![istarget cris*-*-elf]
+	 && ![istarget crx-*-*]
+	 && ![istarget d10v-*-*]
+	 && ![istarget d30v-*-*]
+	 && ![istarget dlx-*-*]
+	 && ![istarget epiphany-*-*]
+	 && ![istarget fr30-*-*]
+	 && ![istarget frv-*-*]
+	 && ![istarget h8300-*-*]
+	 && ![istarget i860-*-*]
+	 && ![istarget i960-*-*]
+	 && ![istarget ip2k-*-*]
+	 && ![istarget iq2000-*-*]
+	 && ![istarget lm32-*-*]
+	 && ![istarget m32c-*-*]
+	 && ![istarget m32r-*-*]
+	 && ![istarget m6811-*-*]
+	 && ![istarget m6812-*-*]
+	 && ![istarget m68hc1*-*-*]
+	 && ![istarget mcore*-*-*]
+	 && ![istarget mep-*-*]
+	 && ![istarget microblaze-*-*]
+	 && ![istarget mips*-*-elf]
+	 && ![istarget mn10200-*-*]
+	 && ![istarget moxie-*-*]
+	 && ![istarget msp430-*-*]
+	 && ![istarget mt-*-*]
+	 && ![istarget nds32*-*-*]
+	 && ![istarget or1k*-*-*]
+	 && ![istarget pj-*-*]
+	 && ![istarget rl78-*-*]
+	 && ![istarget rx-*-*]
+	 && ![istarget spu-*-*]
+	 && ![istarget v850*-*-*]
+	 && ![istarget xstormy16-*-*]
+	 && ![istarget *-*-irix*]
+	 && ![istarget *-*-rtems] } {
+	return 1
+    }
+    return 0
+}
+
+# Returns true if the target ld supports the plugin API.
+proc check_plugin_api_available { } {
+    global plugin_api_available_saved
+    global ld
+    if {![info exists plugin_api_available_saved]} {
+	# Check if the ld used by gcc supports --plugin.
+	set ld_output [remote_exec host $ld "--help"]
+	if { [ string first "-plugin PLUGIN" $ld_output ] >= 0 } {
+	    set plugin_api_available_saved 1
+	} else {
+	    set plugin_api_available_saved 0
+	}
+    }
+    return $plugin_api_available_saved
+}
+
+# Returns true if the target ld supports sysroot.
+proc check_sysroot_available { } {
+    global ld_sysroot_available_saved
+    global ld
+    if {![info exists ld_sysroot_available_saved]} {
+	# Check if ld supports --sysroot *other* than empty
+	# (non-sysroot linkers don't emit errors for --sysroot="").
+	# The help-text by itself is no indication as it always lists --sysroot.
+	set status [remote_exec host $ld "--sysroot=ldxyzzy --help >/dev/null"]
+	if { [lindex $status 0] != 0 } {
+	    set ld_sysroot_available_saved 0
+	} else {
+	    set ld_sysroot_available_saved 1
+	}
+    }
+    return $ld_sysroot_available_saved
+}
+
+# Returns true if the target compiler supports LTO
+proc check_lto_available { } {
+    global lto_available_saved
+    global CC
+
+    if {![info exists lto_available_saved]} {
+        if { [which $CC] == 0 } {
+	    set lto_available_saved 0
+	    return 0
+	}
+	# Check if gcc supports -flto -fuse-linker-plugin
+	set flags ""
+	if [board_info [target_info name] exists cflags] {
+	    append flags " [board_info [target_info name] cflags]"
+	}
+	if [board_info [target_info name] exists ldflags] {
+	    append flags " [board_info [target_info name] ldflags]"
+	}
+
+	set basename "tmpdir/lto[pid]"
+	set src ${basename}.c
+	set output ${basename}.out
+	set f [open $src "w"]
+	puts $f "int main() { return 0; }"
+	close $f
+	remote_download host $src
+	set lto_available_saved [run_host_cmd_yesno "$CC" "$flags -flto -fuse-linker-plugin $src -o $output"]
+	remote_file host delete $src
+	remote_file host delete $output
+	file delete $src
+    }
+    return $lto_available_saved
+}
+
+# Returns true if the target compiler supports LTO  -ffat-lto-objects
+proc check_lto_fat_available { } {
+    global lto_fat_available_saved
+    global CC
+
+    if {![info exists lto_fat_available_saved]} {
+        if { [which $CC] == 0 } {
+	    set lto_fat_available_saved 0
+	    return 0
+	}
+	# Check if gcc supports -flto -fuse-linker-plugin
+	set flags ""
+	if [board_info [target_info name] exists cflags] {
+	    append flags " [board_info [target_info name] cflags]"
+	}
+	if [board_info [target_info name] exists ldflags] {
+	    append flags " [board_info [target_info name] ldflags]"
+	}
+
+	set basename "tmpdir/lto[pid]"
+	set src ${basename}.c
+	set output ${basename}.out
+	set f [open $src "w"]
+	puts $f "int main() { return 0; }"
+	close $f
+	remote_download host $src
+	set lto_fat_available_saved [run_host_cmd_yesno "$CC" "$flags -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"]
+	remote_file host delete $src
+	remote_file host delete $output
+	file delete $src
+    }
+    return $lto_fat_available_saved
+}
+
+# Returns true if the target compiler supports LTO and -shared
+proc check_lto_shared_available { } {
+    global lto_shared_available_saved
+    global CC
+
+    if {![info exists lto_shared_available_saved]} {
+        if { [which $CC] == 0 } {
+	    set lto_shared_available_saved 0
+	    return 0
+	}
+	# Check if gcc supports -flto -fuse-linker-plugin -shared
+	set flags ""
+	if [board_info [target_info name] exists cflags] {
+	    append flags " [board_info [target_info name] cflags]"
+	}
+	if [board_info [target_info name] exists ldflags] {
+	    append flags " [board_info [target_info name] ldflags]"
+	}
+
+	set basename "tmpdir/lto_shared[pid]"
+	set src ${basename}.c
+	set output ${basename}.so
+	set f [open $src "w"]
+	puts $f ""
+	close $f
+	remote_download host $src
+	set lto_shared_available_saved [run_host_cmd_yesno "$CC" "$flags -shared -fPIC -flto -fuse-linker-plugin $src -o $output"]
+	remote_file host delete $src
+	remote_file host delete $output
+	file delete $src
+    }
+    return $lto_shared_available_saved
+}
+
+# Check if the assembler supports CFI statements.
+
+proc check_as_cfi { } {
+    global check_as_cfi_result
+    global as
+    if [info exists check_as_cfi_result] {
+	return $check_as_cfi_result
+    }
+    set as_file "tmpdir/check_as_cfi.s"
+    set as_fh [open $as_file w 0666]
+    puts $as_fh "# Generated file. DO NOT EDIT"
+    puts $as_fh "\t.cfi_startproc"
+    puts $as_fh "\t.cfi_endproc"
+    close $as_fh
+    remote_download host $as_file
+    verbose -log "Checking CFI support:"
+    rename "perror" "check_as_cfi_perror"
+    proc perror { args } { }
+    set success [ld_assemble $as $as_file "/dev/null"]
+    rename "perror" ""
+    rename "check_as_cfi_perror" "perror"
+    #remote_file host delete $as_file
+    set check_as_cfi_result $success
+    return $success
+}
+
+# Provide virtual target "cfi" for targets supporting CFI.
+
+rename "istarget" "istarget_ld"
+proc istarget { target } {
+    if {$target == "cfi"} {
+	return [check_as_cfi]
+    }
+    return [istarget_ld $target]
+}