X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Ftestsuite%2Fbinutils-all%2Fobjcopy.exp;h=88f63fee393013d8388d8cbf0e79f986793905b7;hb=5b660084e26050d2e7f1fda06daec1e83311c188;hp=f7f6cde338963cf7e93f39ac137351bdacdd5a61;hpb=500ee42ee091d6e8860d237bd5e74e8cdcf61d70;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index f7f6cde338..88f63fee39 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1,17 +1,15 @@
-#   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2006, 2007, 2009
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1994-2019 Free Software Foundation, Inc.
 
 # This program 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 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # 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.
@@ -48,15 +46,15 @@ proc objcopy_test {testname srcfile} {
     global tempfile
     global copyfile
 
-    if {![binutils_assemble $srcdir/$subdir/${srcfile} tmpdir/bintest.o]} then {
- 	perror "unresolved $testname"
+    if {![binutils_assemble $srcdir/$subdir/${srcfile} $tempfile]} then {
 	unresolved "objcopy ($testname)"
+	remote_file host delete $tempfile
 	return
     }
 
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS $tempfile ${copyfile}.o"]
 
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
 	fail "objcopy ($testname)"
     } else {
 	send_log "cmp $tempfile ${copyfile}.o\n"
@@ -79,22 +77,15 @@ proc objcopy_test {testname srcfile} {
 	# files in the first place, and may order things a little
 	# differently. Those systems should use setup_xfail here.
 
-	setup_xfail "h8300-*-rtems*" "h8300-*-coff"
-	setup_xfail "h8500-*-rtems*" "h8500-*-coff"
 	setup_xfail "hppa*-*-*"
-	setup_xfail "i960-*"
-	setup_xfail "m68*-*-*coff" "m68*-*-hpux*" "m68*-*-lynxos*"
-	setup_xfail "m68*-*-sysv*" "m68*-apple-aux*"
 	setup_xfail "m8*-*"
-	setup_xfail "or32-*-rtems*" "or32-*-coff"
-	setup_xfail "sh-*-coff*" "sh-*-rtems*" 
-	setup_xfail "tic4x-*-*" "tic80-*-*" "w65-*"
+	setup_xfail "sh-*-coff*"
+	setup_xfail "tic54x-*-*"
 
 	clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*"
 	clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-rtems*" "*-*-*elf*"
-	clear_xfail "m68*-*-sysv4*"
 
-	if [string match "" $exec_output] then {
+	if [string equal "" $exec_output] then {
 	    pass "objcopy ($testname)"
 	} else {
 	    send_log "$exec_output\n"
@@ -110,102 +101,196 @@ proc objcopy_test {testname srcfile} {
 
 objcopy_test "simple copy" bintest.s
 
-# Test reversing bytes in a section.
+# Test verilog data width
+proc objcopy_test_verilog {testname} {
+    global OBJCOPY
+    global OBJCOPYFLAGS
+    global srcdir
+    global subdir
+    global copyfile
+    set binfile tmpdir/verilogtest.o
+    set verilog tmpdir/verilog
+
+    set got [binutils_assemble $srcdir/$subdir/verilogtest.s $binfile]
+    if {![binutils_assemble $srcdir/$subdir/verilogtest.s $binfile]} then {
+	unresolved "objcopy ($testname)"
+	return
+    }
+
+    set got [binutils_run $OBJCOPY "-O verilog $binfile $verilog"]
+    if ![string equal "" $got] then {
+	fail "objcopy ($testname)"
+    }
 
-set reversed ${tempfile}-reversed
-set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -j .data --reverse-bytes=4 $tempfile $reversed"]
+    set got [binutils_run $OBJCOPY "-O verilog --verilog-data-width 0 $binfile $verilog-0.hex"]
+    if ![regexp "verilog data width must be at least 1 byte" $got] then {
+	fail "objcopy ($testname 0) {$got}"
+    } else {
+	pass "objcopy ($testname 0)"
+    }
 
-if ![string match "" $got] then {
-    fail "objcopy --reverse-bytes"
-} else {
-    if [is_remote host] {
-        remote_upload host ${reversed} tmpdir/copy-reversed.o
-        set reversed tmpdir/copy-reversed.o
+    foreach width {1 2 4 8} {
+	set got [binutils_run $OBJCOPY "-O verilog --verilog-data-width $width $binfile $verilog-$width.hex"]
+	if ![string equal "" $got] then {
+	    fail "objcopy ($testname $width)"
+	}
+        send_log "regexp_diff $verilog-$width.hex $srcdir/$subdir/verilog-$width.hex\n"
+	if {! [regexp_diff "$verilog-$width.hex" "$srcdir/$subdir/verilog-$width.hex"]} {
+	    pass "objcopy ($testname $width)"
+	} else {
+	    fail "objcopy ($testname $width)"
+	}
     }
+}
 
-    set origdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $tempfile"]
-    set revdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $reversed"]
+objcopy_test_verilog "verilog data width"
 
-    set want "^ \[0-9\]+ (\[0-9\]+)"
-    set found_orig [regexp -lineanchor $want $origdata -> origdata]
-    set found_rev [regexp -lineanchor $want $revdata -> revdata]
+if { [file exists $tempfile] } {
+    # Test reversing bytes in a section.
 
-    if {$found_orig == 0 || $found_rev == 0} then {
-        fail "objcopy --reverse-bytes"
+    set reversed ${tempfile}-reversed
+    set sect_names [get_standard_section_names]
+    if { $sect_names != "" } {
+	set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -j [lindex $sect_names 1] --reverse-bytes=4 $tempfile $reversed"]
     } else {
-        scan $origdata "%2x%2x%2x%2x" b1 b2 b3 b4
-        scan $revdata "%2x%2x%2x%2x" c4 c3 c2 c1
+	set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -j .data --reverse-bytes=4 $tempfile $reversed"]
+    }
+
+    if ![string equal "" $got] then {
+	fail "objcopy --reverse-bytes"
+    } else {
+	if [is_remote host] {
+	    remote_upload host ${reversed} tmpdir/copy-reversed.o
+	    set reversed tmpdir/copy-reversed.o
+	}
+
+	set origdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $tempfile"]
+	set  revdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $reversed"]
 
-        if {$b1 == $c1 && $b2 == $c2 && $b3 == $c3 && $b4 == $c4} then {
-            pass "objcopy --reverse-bytes"
-        } else {
-            fail "objcopy --reverse-bytes"
-        }
+	set want "^ \[0-9\]+ (\[0-9\]+)"
+	set found_orig [regexp -lineanchor $want $origdata -> origdata]
+	set found_rev [regexp -lineanchor $want $revdata -> revdata]
+
+	if {$found_orig == 0 || $found_rev == 0} then {
+	    # som doesn't have a .data section
+	    setup_xfail "hppa*-*-hpux*"
+	    clear_xfail "hppa*64*-*-hpux*"
+
+	    fail "objcopy --reverse-bytes"
+	} else {
+	    scan $origdata "%2x%2x%2x%2x" b1 b2 b3 b4
+	    scan $revdata "%2x%2x%2x%2x" c4 c3 c2 c1
+
+	    if {$b1 == $c1 && $b2 == $c2 && $b3 == $c3 && $b4 == $c4} then {
+		pass "objcopy --reverse-bytes"
+	    } else {
+		fail "objcopy --reverse-bytes"
+	    }
+	}
     }
 }
 
-# Test generating S records.
+# Test interleaved copy of multiple byte width
 
-# We make the srec filename 8.3 compatible. Note that the header string
-# matched against depends on the name of the file. Ugh.
+set sequence_file sequence_file
+set file [open ${sequence_file} w]
+puts ${file} "12345678"
+close ${file}
 
 if [is_remote host] {
-    set srecfile copy.sre
-    set header_string S00B0000636F70792E737265C1
-} else {
-    set srecfile ${copyfile}.srec
-    set header_string S0130000746D706469722F636F70792E7372656397
+    remote_upload host ${sequence_file} tmpdir/sequence_file
+    set sequence_file tmpdir/sequence_file
 }
 
-set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${srecfile}"]
+set got [binutils_run $OBJCOPY "-I binary -i 4 -b 0 --interleave-width 2 ${sequence_file} ${copyfile}"]
 
-if ![string match "" $got] then {
-    fail "objcopy -O srec"
+if ![string equal "" $got] then {
+    fail "objcopy -i --interleave-width"
 } else {
     if [is_remote host] {
-	remote_upload host ${srecfile} tmpdir/copy.srec
-	set srecfile tmpdir/copy.srec
+	remote_upload host ${copyfile} tmpdir/interleave_output
+	set interleave_output tmpdir/interleave_output
+    } else {
+	set interleave_output ${copyfile}
     }
-    set file [open ${srecfile} r]
 
-    # The first S record is fixed by the file name we are using.
+    set file [open ${interleave_output} r]
     gets $file line
     send_log "$line\n"
     verbose $line
-    if ![regexp "$header_string.*" $line] {
-	send_log "bad header\n"
+
+    if ![string equal "1256" $line] then {
+	fail "objcopy -i --interleave-width"
+    }
+    pass "objcopy -i --interleave-width"
+
+    close $file
+}
+
+# Test generating S records.
+
+if { [file exists $tempfile] } {
+    # We make the srec filename 8.3 compatible. Note that the header string
+    # matched against depends on the name of the file. Ugh.
+
+    if [is_remote host] {
+	set srecfile copy.sre
+	set header_string S00B0000636F70792E737265C1
+    } else {
+	set srecfile ${copyfile}.srec
+	set header_string S0130000746D706469722F636F70792E7372656397
+    }
+
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${srecfile}"]
+
+    if ![string equal "" $got] then {
 	fail "objcopy -O srec"
     } else {
-	while {[gets $file line] != -1 \
-	       && [regexp "^S\[123\]\[0-9a-fA-F\]+\[\r\n\]*$" $line]} {
-	    send_log "$line\n"
-	    verbose $line
-	    set line "**EOF**"
+	if [is_remote host] {
+	    remote_upload host ${srecfile} tmpdir/copy.srec
+	    set srecfile tmpdir/copy.srec
 	}
+	set file [open ${srecfile} r]
+
+	# The first S record is fixed by the file name we are using.
+	gets $file line
 	send_log "$line\n"
 	verbose $line
-	if ![regexp "^S\[789\]\[0-9a-fA-F\]+\[\r\n\]*$" $line] then {
-	    send_log "bad trailer\n"
+	if ![regexp "$header_string.*" $line] {
+	    send_log "bad header\n"
 	    fail "objcopy -O srec"
 	} else {
-	    if {[gets $file line] != -1} then {
-		send_log "garbage at end\n"
+	    while {[gets $file line] != -1 \
+		       && [regexp "^S\[123\]\[0-9a-fA-F\]+\[\r\n\]*$" $line]} {
 		send_log "$line\n"
 		verbose $line
+		set line "**EOF**"
+	    }
+	    send_log "$line\n"
+	    verbose $line
+	    if ![regexp "^S\[789\]\[0-9a-fA-F\]+\[\r\n\]*$" $line] then {
+		send_log "bad trailer\n"
 		fail "objcopy -O srec"
 	    } else {
-		set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${srecfile}"]
-		if ![regexp "file format srec" $got] then {
-		    send_log "objdump failed\n"
+		if {[gets $file line] != -1} then {
+		    send_log "garbage at end\n"
+		    send_log "$line\n"
+		    verbose $line
 		    fail "objcopy -O srec"
 		} else {
-		    pass "objcopy -O srec"
+		    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${srecfile}"]
+		    if ![regexp "file format srec" $got] then {
+			send_log "objdump failed\n"
+			fail "objcopy -O srec"
+		    } else {
+			pass "objcopy -O srec"
+		    }
 		}
 	    }
 	}
-    }
 
-    close $file
+	close $file
+    }
 }
 
 # Test setting and adjusting the start address.  We only test this
@@ -219,7 +304,7 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
     set origstart ""
 } else {
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --set-start 0x7654 $tempfile ${copyfile}.srec"]
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
 	fail "objcopy --set-start"
     } else {
 	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.srec"]
@@ -236,7 +321,7 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
     }
 
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-start 0x123 $tempfile ${copyfile}.srec"]
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
 	fail "objcopy --adjust-start"
     } else {
 	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.srec"]
@@ -281,7 +366,7 @@ if {$low == "" || $origstart == ""} then {
     perror "objdump can not recognize bintest.o"
 } else {
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-vma 0x123 $tempfile ${copyfile}.srec"]
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
         fail "objcopy --adjust-vma"
     } else {
 	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -fh ${copyfile}.srec"]
@@ -315,7 +400,7 @@ if {$low == "" || $origstart == ""} then {
     }
 
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $arg $tempfile ${copyfile}.srec"]
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
 	fail "objcopy --adjust-section-vma +"
     } else {
 	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h ${copyfile}.srec"]
@@ -335,7 +420,7 @@ if {$low == "" || $origstart == ""} then {
 
     regsub -all "\\+4" $arg "=[expr $low + 4]" argeq
     set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $argeq $tempfile ${copyfile}.srec"]
-    if ![string match "" $got] then {
+    if ![string equal "" $got] then {
 	fail "objcopy --adjust-section-vma ="
     } else {
 	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h ${copyfile}.srec"]
@@ -365,6 +450,7 @@ proc strip_test { } {
     global NMFLAGS
     global srcdir
     global subdir
+    global READELF
 
     set test "strip"
 
@@ -373,6 +459,19 @@ proc strip_test { } {
 	return
     }
 
+    set osabi_fail "false"
+    if [is_elf_format] {
+	verbose -log "$READELF -a tmpdir/testprog.o > tmpdir/osabi.in"
+	set exec_output [remote_exec host "$READELF -h tmpdir/testprog.o" "" "/dev/null" "tmpdir/osabi.in"]
+	if { [lindex $exec_output 0] != 0 } then {
+	    unresolved "$test preserving OS/ABI"
+	    set osabi_fail "true"
+	} else {
+	    verbose -log "grep OS/ABI tmpdir/osabi.in"
+	    catch "exec grep OS/ABI tmpdir/osabi.in" osabi_in
+	}
+    }
+
     if [is_remote host] {
 	set archive libstrip.a
 	set objfile [remote_download host tmpdir/testprog.o]
@@ -385,23 +484,45 @@ proc strip_test { } {
     remote_file build delete tmpdir/libstrip.a
 
     set exec_output [binutils_run $AR "rc $archive ${objfile}"]
-    if ![string match "" $exec_output] {
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
 	fail $test
+	unresolved "$test preserving OS/ABI"
 	return
     }
 
     set exec_output [binutils_run $STRIP "-g $archive"]
-    if ![string match "" $exec_output] {
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
 	fail $test
+	unresolved "$test preserving OS/ABI"
 	return
     }
 
     set exec_output [binutils_run $STRIP "$STRIPFLAGS $archive"]
-    if ![string match "" $exec_output] {
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
 	fail $test
+	unresolved "$test preserving OS/ABI"
 	return
     }
 
+    if { $osabi_fail != "true" && [is_elf_format] } {
+	verbose -log "$READELF -a tmpdir/testprog.o > tmpdir/osabi.out"
+	set exec_output [remote_exec host "$READELF -h tmpdir/testprog.o" "" "/dev/null" "tmpdir/osabi.out"]
+	if { [lindex $exec_output 0] != 0 } then {
+	    unresolved "$test preserving OS/ABI"
+	} else {
+	    verbose -log "grep OS/ABI tmpdir/osabi.out"
+	    catch "exec grep OS/ABI tmpdir/osabi.out" osabi_out
+	    if { "$osabi_in" == "$osabi_out" } {
+		pass "$test preserving OS/ABI"
+	    } else {
+		fail "$test preserving OS/ABI"
+	    }
+	}
+    }
+
     if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog.o object debug] != "" } {
 	untested $test
 	return
@@ -414,12 +535,14 @@ proc strip_test { } {
     }
 
     set exec_output [binutils_run $STRIP "$STRIPFLAGS $objfile"]
-    if ![string match "" $exec_output] {
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
 	fail $test
 	return
     }
 
     set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
+    set exec_output [prune_warnings $exec_output]
     if ![string match "*: no symbols*" $exec_output] {
 	fail $test
 	return
@@ -455,12 +578,14 @@ proc strip_test_with_saving_a_symbol { } {
     }
 
     set exec_output [binutils_run $STRIP "$STRIPFLAGS -K main -K _main $objfile"]
-    if ![string match "" $exec_output] {
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
 	fail $test
 	return
     }
 
     set exec_output [binutils_run $NM "$NMFLAGS $objfile"]
+    set exec_output [prune_warnings $exec_output]
     if {![regexp {^([0-9a-fA-F]+)?[ ]+[TD] main} $exec_output] \
          && ![regexp {^([0-9a-fA-F]+)?[ ]+T _main} $exec_output]} {
 	fail $test
@@ -486,14 +611,14 @@ proc copy_setup { } {
     global gcc_gas_flag
     global test_prog
     global host_triplet
-    
+
     set res [build_wrapper testglue.o]
     set flags { debug }
-    
-    if { [istarget *-*-uclinux*] } {
+
+    if { [istarget *-*-uclinux*] && ![istarget tic6x-*-*] && ![istarget arm*-*-uclinuxfdpiceabi] } {
 	return 1
     }
-    
+
     if { $res != "" } {
 	lappend flags "additional_flags=[lindex $res 1]"
 	set add_libs "testglue.o"
@@ -501,7 +626,8 @@ proc copy_setup { } {
 	set add_libs ""
     }
 
-    if { [istarget *-*-linux*] } {
+    if { [istarget *-*-linux*]
+	 || [istarget *-*-gnu*] } {
 	foreach i $gcc_gas_flag {
 	    set flags "additional_flags=$i $flags"
 	}
@@ -515,10 +641,7 @@ proc copy_setup { } {
 
     if { $status != "pass"  } {
 	send_log "cannot run executable, status = ${status} on ${host_triplet}\n"
-	if { [istarget $host_triplet] } {
-	  return 3
-	}
-      set status "pass"
+	return 3
     }
 
     return 0
@@ -528,7 +651,6 @@ proc copy_setup { } {
 
 proc copy_executable { prog flags test1 test2 } {
     global test_prog
-    global host_triplet
 
     if [is_remote host] {
 	set testfile [remote_download host tmpdir/$test_prog]
@@ -541,9 +663,9 @@ proc copy_executable { prog flags test1 test2 } {
 
     set exec_output [binutils_run $prog "$flags $testfile $testcopy"]
 
-    if ![string match "" $exec_output] {
+    if ![string equal "" $exec_output] {
 	fail $test1
-	if [string match "" $test2] {
+	if [string equal "" $test2] {
 	    return
 	}
 	fail $test2
@@ -557,7 +679,7 @@ proc copy_executable { prog flags test1 test2 } {
     set status [remote_exec build "cmp" "tmpdir/$test_prog tmpdir/copyprog"]
     set exec_output [lindex $status 1]
 
-    if [string match "" $exec_output] then {
+    if [string equal "" $exec_output] then {
 	pass $test1
     } else {
 	send_log "$exec_output\n"
@@ -574,30 +696,25 @@ proc copy_executable { prog flags test1 test2 } {
 	    setup_xfail "*-*-*"
 	}
 
-	# This also fails for mips*-*-elf targets.  See elf32-mips.c
+	# This also fails for some mips targets.  See elf32-mips.c
 	# mips_elf_sym_is_global.
-	setup_xfail "mips*-*-elf"
+	if { [is_bad_symtab] } then {
+	    setup_xfail "*-*-*"
+	}
 
-	setup_xfail "*arm*-*-coff"
-	setup_xfail "xscale-*-coff"
 	setup_xfail "arm*-*-pe"
-	setup_xfail "thumb*-*-coff"
-	setup_xfail "thumb*-*-pe"
-	setup_xfail "x86_64-*-mingw*"
+	setup_xfail "*-*-mingw*"
 	setup_xfail "*-*-cygwin*"
-    
+
 	fail $test1
     }
 
-    if [string match "" $test2] {
+    if [string equal "" $test2] {
 	return
     }
 
     set output [remote_load target tmpdir/copyprog]
     set status [lindex $output 0]
-    if { ![istarget $host_triplet] } {
-      set status "pass"
-    }
     if { $status != "pass" } {
 	fail $test2
     } else {
@@ -607,10 +724,10 @@ proc copy_executable { prog flags test1 test2 } {
 
 # Test stripping an executable
 
-proc strip_executable { prog flags test } {
+proc strip_executable { prog flags test1 test2 } {
     global NM
     global NMFLAGS
-    global host_triplet
+    global READELF
 
     remote_file build delete tmpdir/striprog
     remote_download build tmpdir/copyprog tmpdir/striprog
@@ -620,9 +737,26 @@ proc strip_executable { prog flags test } {
 	set copyfile tmpdir/striprog
     }
 
+    set osabi_fail "false"
+    if [is_elf_format] {
+	verbose -log "$READELF -a ${copyfile} > tmpdir/osabi.in"
+	set exec_output [remote_exec host "$READELF -h ${copyfile}" "" "/dev/null" "tmpdir/osabi.in"]
+	if { [lindex $exec_output 0] != 0 } then {
+	    unresolved "$test1 preserving OS/ABI"
+	    set osabi_fail "true"
+	} else {
+	    verbose -log "grep OS/ABI tmpdir/osabi.in"
+	    catch "exec grep OS/ABI tmpdir/osabi.in" osabi_in
+	}
+     }
+
     set exec_output [binutils_run $prog "$flags ${copyfile}"]
-    if ![string match "" $exec_output] {
-	fail $test
+    if ![string equal "" $exec_output] {
+	fail $test1
+	if [string equal "" $test2] {
+	    return
+	}
+	fail $test2
 	return
     }
 
@@ -630,30 +764,47 @@ proc strip_executable { prog flags test } {
 	remote_upload host ${copyfile} tmpdir/striprog
     }
 
-    set result [remote_load target tmpdir/striprog]
-    set status [lindex $result 0]
-    if { ![istarget $host_triplet] } {
-      set status "pass"
-    }
-    if { $status != "pass" } {
-	fail $test
-        return
+    if { $osabi_fail != "true" && [is_elf_format] } {
+	verbose -log "$READELF -a ${copyfile} > tmpdir/osabi.out"
+	set exec_output [remote_exec host "$READELF -h ${copyfile}" "" "/dev/null" "tmpdir/osabi.out"]
+	if { [lindex $exec_output 0] != 0 } then {
+	    unresolved "$test1 preserving OS/ABI"
+	} else {
+	    verbose -log "grep OS/ABI tmpdir/osabi.out"
+	    catch "exec grep OS/ABI tmpdir/osabi.out" osabi_out
+	    if { "$osabi_in" == "$osabi_out" } {
+		pass "$test1 preserving OS/ABI"
+	    } else {
+		fail "$test1 preserving OS/ABI"
+	    }
+	}
     }
 
     set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
     if ![string match "*: no symbols*" $exec_output] {
-	fail $test
+	fail $test1
 	return
     }
-    pass $test
+
+    if [string equal "" $test2] {
+	return
+    }
+
+    set result [remote_load target tmpdir/striprog]
+    set status [lindex $result 0]
+    if { $status != "pass" } {
+	fail $test2
+        return
+    }
+
+    pass $test2
 }
 
 # Test stripping an executable with saving a symbol
 
-proc strip_executable_with_saving_a_symbol { prog flags test } {
+proc strip_executable_with_saving_a_symbol { prog flags test1 test2 } {
     global NM
     global NMFLAGS
-    global host_triplet
 
     remote_file build delete tmpdir/striprog
     remote_download build tmpdir/copyprog tmpdir/striprog
@@ -664,25 +815,15 @@ proc strip_executable_with_saving_a_symbol { prog flags test } {
     }
 
     set exec_output [binutils_run $prog "$flags ${copyfile}"]
-    if ![string match "" $exec_output] {
-	fail $test
+    if ![string equal "" $exec_output] {
+	fail $test1
+	if [string equal "" $test2] {
+	    return
+	}
+	fail $test2
 	return
     }
 
-    if [is_remote host] {
-	remote_upload host ${copyfile} tmpdir/striprog
-    }
-
-    set result [remote_load target tmpdir/striprog]
-    set status [lindex $result 0]
-    if { ![istarget $host_triplet] } {
-      set status "pass"
-    }
-    if { $status != "pass" } {
-	fail $test
-        return
-    }
-
     set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
     if { [istarget mmix-knuth-mmixware] } {
 	# Whenever there's a symbol in the mmo format, there's the symbol
@@ -695,18 +836,31 @@ proc strip_executable_with_saving_a_symbol { prog flags test } {
 
     if {![regexp {^([0-9a-fA-F]+)?[ ]+[TD] main} $exec_output] \
          && ![regexp {^([0-9a-fA-F]+)?[ ]+[TD] _main} $exec_output]} {
-	fail $test
+	fail $test1
 	return
     }
-    pass $test
+
+    if [string equal "" $test2] {
+	return
+    }
+
+    if [is_remote host] {
+	remote_upload host ${copyfile} tmpdir/striprog
+    }
+
+    set result [remote_load target tmpdir/striprog]
+    set status [lindex $result 0]
+    if { $status != "pass" } {
+	fail $test2
+        return
+    }
+
+    pass $test2
 }
 
 # Test keeping only debug symbols of an executable
 
 proc keep_debug_symbols_and_test_copy { prog1 flags1 test1 prog2 flags2 test2 } {
-    global NM
-    global NMFLAGS
-
     remote_file build delete tmpdir/striprog
     remote_download build tmpdir/copyprog tmpdir/striprog
     if [is_remote host] {
@@ -716,26 +870,86 @@ proc keep_debug_symbols_and_test_copy { prog1 flags1 test1 prog2 flags2 test2 }
     }
 
     set exec_output [binutils_run $prog1 "$flags1 ${copyfile}"]
-    if ![string match "" $exec_output] {
+    if ![string equal "" $exec_output] {
 	fail $test1
 	return
     }
     pass $test1
 
     set exec_output [binutils_run $prog2 "$flags2 ${copyfile}"]
-    if ![string match "" $exec_output] {
+    if ![string equal "" $exec_output] {
 	fail $test2
 	return
     }
     pass $test2
 }
 
+# Tests that in a debug only copy of a file the sections
+# headers whose types have been changed to NOBITS still
+# retain their sh_link fields.
+
+proc keep_debug_symbols_and_check_links { prog flags test } {
+    global READELF
+
+    remote_file build delete tmpdir/striprog
+    remote_download build tmpdir/copyprog tmpdir/striprog
+    if [is_remote host] {
+	set copyfile [remote_download host tmpdir/striprog]
+    } else {
+	set copyfile tmpdir/striprog
+    }
+
+    set exec_output [binutils_run $prog "$flags ${copyfile}"]
+    if ![string equal "" $exec_output] {
+	fail $test
+	return
+    }
+
+    set got [binutils_run $READELF "-S --wide ${copyfile}"]
+
+    set fails 0
+    # Regexp to match a section with NOBITS type and extract its name and sh_link fields
+    while {[regexp \
+		{[^a-zA-Z]+([a-zA-Z0-9_\.]+)[ 	]+NOBITS[ 	]+[0-9a-fA-F]+ [0-9a-fA-F]+ [0-9a-fA-F]+ [0-9]+[ A]+([0-9]+)(.*)} \
+		$got all name link rest]} {
+	set sh_link 0x$link
+	if {$sh_link == 0} {
+	    # Only some NOBITS sections should have a non-zero sh_link field.
+	    # Look for them by name.
+	    verbose "NOBITS section .$name has a 0 sh_link field\n"
+	    switch $name {
+		"rela.*"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"rel.*"		{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"hash"		{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"gnu_version"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"dynsym"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"gnu.version_r"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"dynamic"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+		"symtab"	{ set fails 1 ; send_log "Expected non-zero sh_link for .$name\n" }
+	    }
+	}
+	set got $rest
+    }
+
+    if {$fails == 0} {
+	pass $test
+    } else {
+	fail $test
+    }
+}
+
+
 set test1 "simple objcopy of executable"
-set test2 "run objcopy of executable"
-set test3 "run stripped executable"
-set test4 "run stripped executable with saving a symbol"
-set test5 "keep only debug data"
-set test6 "simple objcopy of debug data"
+set test1r "run objcopy of executable"
+set test2 "strip executable"
+set test2r "run stripped executable"
+set test3 "strip executable with saving a symbol"
+set test3r "run stripped executable with saving a symbol"
+set test4 "keep only debug data"
+set test5 "simple objcopy of debug data"
+if [is_elf_format] {
+    set test6 "NOBITS sections retain sh_link field"
+}
 
 switch [copy_setup] {
     "1" {
@@ -743,26 +957,39 @@ switch [copy_setup] {
     }
     "2" {
 	untested $test1
+	untested $test1r
 	untested $test2
+	untested $test2r
 	untested $test3
+	untested $test3r
 	untested $test4
 	untested $test5
-	untested $test6
+	if [is_elf_format] {
+	    untested $test6
+	}
     }
     "3" {
 	copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" ""
-	unsupported $test2
-	unsupported $test3
-	unsupported $test4
-	unsupported $test5
-	unsupported $test6
+	unsupported $test1r
+	strip_executable "$STRIP" "$STRIPFLAGS" "$test2" ""
+	unsupported $test2r
+	strip_executable_with_saving_a_symbol "$STRIP" "-K main -K _main $STRIPFLAGS" "$test3" ""
+	unsupported $test3r
+	keep_debug_symbols_and_test_copy "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test4" \
+					 "$OBJCOPY" "$OBJCOPYFLAGS" "$test5"
+	if [is_elf_format] {
+	    keep_debug_symbols_and_check_links "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test6"
+	}
     }
     "0" {
-	copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" "$test2"
-	strip_executable "$STRIP" "$STRIPFLAGS" "$test3"
-	strip_executable_with_saving_a_symbol "$STRIP" "-K main -K _main $STRIPFLAGS" "$test4"
-	keep_debug_symbols_and_test_copy "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test5" \
-					 "$OBJCOPY" "$OBJCOPYFLAGS" "$test6"
+	copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" "$test1r"
+	strip_executable "$STRIP" "$STRIPFLAGS" "$test2" "$test2r"
+	strip_executable_with_saving_a_symbol "$STRIP" "-K main -K _main $STRIPFLAGS" "$test3" "$test3r"
+	keep_debug_symbols_and_test_copy "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test4" \
+					 "$OBJCOPY" "$OBJCOPYFLAGS" "$test5"
+	if [is_elf_format] {
+	    keep_debug_symbols_and_check_links "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test6"
+	}
     }
 }
 
@@ -781,7 +1008,7 @@ proc objcopy_test_readelf {testname srcfile} {
     verbose -log "$OBJCOPY $OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.o"
     set exec_output [remote_exec host "$OBJCOPY $OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.o"]
     if { [lindex $exec_output 0] != 0
-	 || ![string match "" [lindex $exec_output 1]] } then {
+	 || ![string equal "" [lindex $exec_output 1]] } then {
 	fail "objcopy ($testname)"
 	return
     }
@@ -793,7 +1020,7 @@ proc objcopy_test_readelf {testname srcfile} {
 	return
     }
     set exec_output [prune_warnings [lindex $exec_output 1]]
-    if ![string match "" $exec_output] then {
+    if ![string equal "" $exec_output] then {
 	unresolved "objcopy ($testname)"
 	return
     }
@@ -805,7 +1032,7 @@ proc objcopy_test_readelf {testname srcfile} {
 	return
     }
     set exec_output [prune_warnings [lindex $exec_output 1]]
-    if ![string match "" $exec_output] then {
+    if ![string equal "" $exec_output] then {
 	unresolved "objcopy ($testname)"
 	return
     }
@@ -814,13 +1041,42 @@ proc objcopy_test_readelf {testname srcfile} {
     catch "exec diff tmpdir/bintest.o.out tmpdir/copy.o.out" exec_output
     set exec_output [prune_warnings $exec_output]
 
-    if [string match "" $exec_output] then {
+    if [string equal "" $exec_output] then {
 	pass "objcopy ($testname)"
     } else {
 	fail "objcopy ($testname)"
     }
 }
 
+proc objcopy_test_symbol_manipulation {} {
+    global srcdir
+    global subdir
+
+    set test_list [lsort [glob -nocomplain $srcdir/$subdir/symbols-*.d]]
+    foreach t $test_list {
+        # We need to strip the ".d", but can leave the dirname.
+        verbose [file rootname $t]
+        run_dump_test [file rootname $t]
+    }
+}
+
+proc objcopy_test_elf_common_symbols {} {
+    global srcdir
+    global subdir
+
+    # hpux has a non-standard common directive.
+    if { [istarget "*-*-hpux*"] } then {
+	return
+    }
+
+    set test_list [lsort [glob -nocomplain $srcdir/$subdir/common-*.d]]
+    foreach t $test_list {
+        # We need to strip the ".d", but can leave the dirname.
+        verbose [file rootname $t]
+        run_dump_test [file rootname $t]
+    }
+}
+
 # ia64 specific tests
 if { ([istarget "ia64-*-elf*"]
        || [istarget "ia64-*-linux*"]) } {
@@ -828,18 +1084,52 @@ if { ([istarget "ia64-*-elf*"]
 }
 
 # ELF specific tests
+set elf64 ""
 if [is_elf_format] {
+    objcopy_test_symbol_manipulation
+    objcopy_test_elf_common_symbols
     objcopy_test "ELF unknown section type" unknown.s
-    objcopy_test_readelf "ELF group" group.s
-    objcopy_test_readelf "ELF group" group-2.s
-    objcopy_test_readelf "ELF group" group-3.s
-    objcopy_test_readelf "ELF group" group-4.s
+    objcopy_test_readelf "ELF group 1" group.s
+    objcopy_test_readelf "ELF group 2" group-2.s
+    objcopy_test_readelf "ELF group 3" group-3.s
+    objcopy_test_readelf "ELF group 4" group-4.s
+    objcopy_test_readelf "GNU_MBIND section" mbind1.s
+    run_dump_test "group-5"
+    run_dump_test "group-6"
+    run_dump_test "group-7a"
+    run_dump_test "group-7b"
+    run_dump_test "group-7c"
     run_dump_test "copy-1"
+    run_dump_test "note-1"
+    # Use copytest.o from the note-1 test to determine ELF32 or ELF64
+    if [is_elf64 tmpdir/copytest.o] {
+	set elf64 "--defsym ELF64=1"
+	run_dump_test "note-2-64"
+	run_dump_test "note-3-64"
+	run_dump_test "note-4-64"
+	run_dump_test "note-6-64"
+    } else {
+	run_dump_test "note-2-32"
+	run_dump_test "note-3-32"
+	run_dump_test "note-4-32"
+	run_dump_test "note-6-32"
+    }
+    run_dump_test "note-5"
 }
 
 run_dump_test "copy-2"
 run_dump_test "copy-3"
 run_dump_test "copy-4"
+run_dump_test "copy-5"
+run_dump_test "copy-6"
+
+# Use bintest.o from the copy-4 test to determine ELF reloc type
+set reloc_format rel
+if { [is_elf_format] && [is_rela tmpdir/bintest.o] } {
+    set reloc_format rela
+}
+run_dump_test "pr19020a"
+run_dump_test "pr19020b"
 
 if [is_elf_format] {
     run_dump_test "strip-1"
@@ -851,7 +1141,46 @@ if [is_elf_format] {
     run_dump_test "strip-7"
     run_dump_test "strip-8"
     run_dump_test "strip-9"
-    run_dump_test "strip-10"
+    run_dump_test "strip-12"
+
+    if { [istarget "mips64*-*-openbsd*"] } {
+	set reloc_format mips64
+    }
+    # A relocation type not supported by any target
+    if { [istarget "nds32*-*"] } {
+	set reloc 255
+    } else {
+	set reloc 215
+    }
+    run_dump_test "strip-13" [list \
+				  [list source strip-13${reloc_format}.s] \
+				  [list as "${elf64} --defsym RELOC=${reloc}"]]
+    # Select a relocation number that corresponds to one actually
+    # supported by the target and ABI being tested.
+    if { [istarget "aarch64*-*"] } {
+	set reloc 259
+    } elseif { [istarget "ia64*-*"] \
+	       || [istarget "m32r*-*"] \
+	       || [istarget "nds32*-*"] \
+	       || [istarget "v850*-*"] } {
+	set reloc 50
+    } elseif { [istarget "pru-*"] } {
+	set reloc 11
+    } else {
+	set reloc 1
+    }
+    run_dump_test "strip-14" [list \
+				  [list source strip-14${reloc_format}.s] \
+				  [list as "${elf64} --defsym RELOC=${reloc}"]]
+    run_dump_test "strip-15" [list \
+				  [list source strip-15${reloc_format}.s] \
+				  [list as "${elf64} --defsym RELOC=${reloc}"]]
+
+    # This requires STB_GNU_UNIQUE support with OSABI set to GNU.
+    if { [supports_gnu_unique] } {
+	run_dump_test "strip-10"
+    }
+    run_dump_test "strip-11"
 
     if { [istarget "i*86-*"] || [istarget "x86_64-*-*"] } {
 	# Check to make sure we don't strip a symbol named in relocations.
@@ -872,11 +1201,118 @@ if [is_elf_format] {
 	}
     }
 
+    # The symbol table for some MIPS targets is sorted differently than
+    # the ELF canonical order, so the regexps in localize-hidden-1.d fail
+    # to match.
+    if { [is_bad_symtab] } then {
+	setup_xfail "*-*-*"
+    }
     run_dump_test "localize-hidden-1"
     run_dump_test "testranges"
     run_dump_test "testranges-ia64"
 
     run_dump_test "add-section"
+    run_dump_test "add-symbol"
     run_dump_test "add-empty-section"
+
+    run_dump_test "exclude-1a"
+    run_dump_test "exclude-1b"
+
+    run_dump_test "only-section-01"
+    run_dump_test "remove-section-01"
+
+    run_dump_test "keep-section-1"
+    run_dump_test "keep-section-2"
+
+    # Test the remove relocation functionality
+    set test_list [lsort [glob -nocomplain $srcdir/$subdir/remove-relocs-*.d]]
+    foreach t $test_list {
+        # We need to strip the ".d", but can leave the dirname.
+        verbose [file rootname $t]
+        run_dump_test [file rootname $t]
+    }
 }
 run_dump_test "localize-hidden-2"
+
+# Test objcopying an object file without global symbol
+
+proc objcopy_test_without_global_symbol { } {
+    global OBJCOPY
+    global OBJCOPYFLAGS
+    global OBJDUMP
+    global OBJDUMPFLAGS
+    global srcdir
+    global subdir
+
+    set test "strip without global symbol "
+
+    if { [target_compile $srcdir/$subdir/pr19547.c tmpdir/pr19547.o object debug] != "" } {
+	untested $test
+	return
+    }
+
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/pr19547.o]
+    } else {
+	set objfile tmpdir/pr19547.o
+    }
+
+    set exec_output [binutils_run $OBJCOPY "$OBJCOPYFLAGS --strip-unneeded $objfile"]
+    set exec_output [prune_warnings $exec_output]
+    if ![string equal "" $exec_output] {
+	fail $test
+	return
+    }
+
+    set exec_output [binutils_run $OBJDUMP "$OBJDUMPFLAGS -t $objfile"]
+    set exec_output [prune_warnings $exec_output]
+    if {![regexp "no symbols" $exec_output]} {
+	fail $test
+	return
+    }
+
+    pass $test
+}
+
+# The AArch64 and ARM targets preserve mapping symbols
+# in object files, so they will fail this test.
+setup_xfail aarch64*-*-* arm*-*-*
+
+objcopy_test_without_global_symbol
+
+# objcopy remove relocation from executable test
+
+proc objcopy_remove_relocations_from_executable { } {
+    global OBJCOPY
+    global srcdir
+    global subdir
+    global READELF
+
+    set test "remove-section relocation sections"
+
+    if { [target_compile $srcdir/$subdir/testprog.c tmpdir/pr23611 executable debug] != "" } {
+	untested $test
+	return
+    }
+
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/pr23611]
+    } else {
+	set objfile tmpdir/pr23611
+    }
+    set out tmpdir/pr23611.out
+
+    set exec_output1 [binutils_run $OBJCOPY "-R .rela.plt -R .rela.dyn -R .rel.plt -R .rel.dyn $objfile $out"]
+    set exec_output2 [binutils_run $READELF "-S $out"]
+    if { [string match "*.rel.plt*" $exec_output2] || [string match "*.rela.plt*" $exec_output2] || [string match "*.rel.dyn*" $exec_output2] || [string match "*.rela.dyn*" $exec_output2] } {
+	fail $test
+	return
+    }
+    pass $test
+}
+
+objcopy_remove_relocations_from_executable
+
+run_dump_test "pr23633"
+
+run_dump_test "set-section-alignment"