X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Ftestsuite%2Fbinutils-all%2Fobjcopy.exp;h=a22e98c90bdd024c21d9664316bebcf90b72321b;hb=4c8e8a7ee091749d21a6f1ef57f75faa190860fd;hp=f285094e5a45cf1043d65732710c29a2bbec053c;hpb=004314cccdac93ac8d2d7c63776b52f0c202f050;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index f285094e5a..a22e98c90b 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1,10 +1,10 @@
 #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004
+#   2004, 2006, 2007, 2009, 2010, 2011
 #   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 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,
@@ -79,7 +79,7 @@ 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 "h8300-*-coff"
 	setup_xfail "h8500-*-rtems*" "h8500-*-coff"
 	setup_xfail "hppa*-*-*"
 	setup_xfail "i960-*"
@@ -87,8 +87,8 @@ proc objcopy_test {testname srcfile} {
 	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 "tic80-*-*" "w65-*"
 
 	clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*"
 	clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-rtems*" "*-*-*elf*"
@@ -103,9 +103,6 @@ proc objcopy_test {testname srcfile} {
 	    # On OSF/1, this succeeds with gas and fails with /bin/as.
 	    setup_xfail "alpha*-*-osf*"
 
-	    # This fails for COFF i960-vxworks targets.
-	    setup_xfail "i960-*-vxworks*"
-
 	    fail "objcopy ($testname)"
 	}
     }
@@ -113,6 +110,81 @@ proc objcopy_test {testname srcfile} {
 
 objcopy_test "simple copy" bintest.s
 
+# Test reversing bytes in a section.
+
+set reversed ${tempfile}-reversed
+set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -j .data --reverse-bytes=4 $tempfile $reversed"]
+
+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
+    }
+
+    set origdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $tempfile"]
+    set revdata [binutils_run $OBJDUMP "$OBJDUMPFLAGS -s -j .data $reversed"]
+
+    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 interleaved copy of multiple byte width
+
+set sequence_file sequence_file
+set file [open ${sequence_file} w]
+puts ${file} "12345678"
+close ${file}
+
+if [is_remote host] {
+    remote_upload host ${sequence_file} tmpdir/sequence_file
+    set sequence_file tmpdir/sequence_file
+}
+
+set got [binutils_run $OBJCOPY "-I binary -i 4 -b 0 --interleave-width 2 ${sequence_file} ${copyfile}"]
+
+if ![string match "" $got] then {
+    fail "objcopy -i --interleave-width"
+} else {
+    if [is_remote host] {
+	remote_upload host ${copyfile} tmpdir/interleave_output
+	set interleave_output tmpdir/interleave_output
+    } else {
+	set interleave_output ${copyfile}
+    }
+
+    set file [open ${interleave_output} r]
+    gets $file line
+    send_log "$line\n"
+    verbose $line
+
+    if ![string match "1256" $line] then {
+	fail "objcopy -i --interleave-width"
+    }
+    pass "objcopy -i --interleave-width"
+
+    close $file
+}
+
 # Test generating S records.
 
 # We make the srec filename 8.3 compatible. Note that the header string
@@ -163,7 +235,7 @@ if ![string match "" $got] then {
 		verbose $line
 		fail "objcopy -O srec"
 	    } else {
-		set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.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"
@@ -334,6 +406,7 @@ proc strip_test { } {
     global NMFLAGS
     global srcdir
     global subdir
+    global READELF
 
     set test "strip"
 
@@ -342,6 +415,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]
@@ -356,21 +442,40 @@ proc strip_test { } {
     set exec_output [binutils_run $AR "rc $archive ${objfile}"]
     if ![string match "" $exec_output] {
 	fail $test
+	unresolved "$test preserving OS/ABI"	
 	return
     }
 
     set exec_output [binutils_run $STRIP "-g $archive"]
     if ![string match "" $exec_output] {
 	fail $test
+	unresolved "$test preserving OS/ABI"	
 	return
     }
 
     set exec_output [binutils_run $STRIP "$STRIPFLAGS $archive"]
     if ![string match "" $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
@@ -443,7 +548,7 @@ strip_test_with_saving_a_symbol
 
 # Build a final executable.
 
-if { [istarget *-*-cygwin] || [istarget *-*-mingw32] } {
+if { [istarget *-*-cygwin] || [istarget *-*-mingw*] } {
     set test_prog "testprog.exe"
 } else {
     set test_prog "testprog"
@@ -454,10 +559,15 @@ proc copy_setup { } {
     global subdir
     global gcc_gas_flag
     global test_prog
+    global host_triplet
     
     set res [build_wrapper testglue.o]
     set flags { debug }
     
+    if { [istarget *-*-uclinux*] && ![istarget tic6x-*-*] } {
+	return 1
+    }
+    
     if { $res != "" } {
 	lappend flags "additional_flags=[lindex $res 1]"
 	set add_libs "testglue.o"
@@ -465,7 +575,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"
 	}
@@ -478,8 +589,11 @@ proc copy_setup { } {
     set status [lindex $result 0]
 
     if { $status != "pass"  } {
-	perror "unresolved setup, status = $status"
-	return 3
+	send_log "cannot run executable, status = ${status} on ${host_triplet}\n"
+	if { [istarget $host_triplet] } {
+	  return 3
+	}
+      set status "pass"
     }
 
     return 0
@@ -489,6 +603,7 @@ 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]
@@ -503,6 +618,9 @@ proc copy_executable { prog flags test1 test2 } {
 
     if ![string match "" $exec_output] {
 	fail $test1
+	if [string match "" $test2] {
+	    return
+	}
 	fail $test2
 	return
     }
@@ -535,17 +653,23 @@ proc copy_executable { prog flags test1 test2 } {
 	# mips_elf_sym_is_global.
 	setup_xfail "mips*-*-elf"
 
-	setup_xfail "*arm*-*-coff"
-	setup_xfail "xscale-*-coff"
+	setup_xfail "arm*-*-coff"
 	setup_xfail "arm*-*-pe"
-	setup_xfail "thumb*-*-coff"
-	setup_xfail "thumb*-*-pe"
+	setup_xfail "*-*-mingw*"
+	setup_xfail "*-*-cygwin*"
     
 	fail $test1
     }
 
+    if [string match "" $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 {
@@ -558,7 +682,10 @@ proc copy_executable { prog flags test1 test2 } {
 proc strip_executable { prog flags test } {
     global NM
     global NMFLAGS
+    global READELF
+    global host_triplet
 
+    remote_file build delete tmpdir/striprog
     remote_download build tmpdir/copyprog tmpdir/striprog
     if [is_remote host] {
 	set copyfile [remote_download host tmpdir/striprog]
@@ -566,6 +693,19 @@ 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 "$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
+	}
+     }
+
     set exec_output [binutils_run $prog "$flags ${copyfile}"]
     if ![string match "" $exec_output] {
 	fail $test
@@ -578,11 +718,30 @@ proc strip_executable { prog flags test } {
 
     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 "$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"
+	    }
+	}
+    }
+
     set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
     if ![string match "*: no symbols*" $exec_output] {
 	fail $test
@@ -596,7 +755,9 @@ proc strip_executable { prog flags test } {
 proc strip_executable_with_saving_a_symbol { prog flags test } {
     global NM
     global NMFLAGS
+    global host_triplet
 
+    remote_file build delete tmpdir/striprog
     remote_download build tmpdir/copyprog tmpdir/striprog
     if [is_remote host] {
 	set copyfile [remote_download host tmpdir/striprog]
@@ -616,6 +777,9 @@ proc strip_executable_with_saving_a_symbol { prog flags test } {
 
     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
@@ -639,10 +803,41 @@ proc strip_executable_with_saving_a_symbol { prog flags test } {
     pass $test
 }
 
+# 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] {
+	set copyfile [remote_download host tmpdir/striprog]
+    } else {
+	set copyfile tmpdir/striprog
+    }
+
+    set exec_output [binutils_run $prog1 "$flags1 ${copyfile}"]
+    if ![string match "" $exec_output] {
+	fail $test1
+	return
+    }
+    pass $test1
+
+    set exec_output [binutils_run $prog2 "$flags2 ${copyfile}"]
+    if ![string match "" $exec_output] {
+	fail $test2
+	return
+    }
+    pass $test2
+}
+
 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"
 
 switch [copy_setup] {
     "1" {
@@ -653,17 +848,23 @@ switch [copy_setup] {
 	untested $test2
 	untested $test3
 	untested $test4
+	untested $test5
+	untested $test6
     }
     "3" {
-	unresolved $test1
-	unresolved $test2
-	unresolved $test3
-	unresolved $test4
+	copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" ""
+	unsupported $test2
+	unsupported $test3
+	unsupported $test4
+	unsupported $test5
+	unsupported $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"
     }
 }
 
@@ -680,23 +881,32 @@ proc objcopy_test_readelf {testname srcfile} {
     }
 
     verbose -log "$OBJCOPY $OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.o"
-    catch "exec $OBJCOPY $OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.o" exec_output
-    if ![string match "" $exec_output] then {
+    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 {
 	fail "objcopy ($testname)"
 	return
     }
 
     verbose -log "$READELF -a tmpdir/bintest.o > tmpdir/bintest.o.out"
-    catch "exec $READELF -a tmpdir/bintest.o > tmpdir/bintest.o.out" exec_output
-    set exec_output [prune_warnings $exec_output]
+    set exec_output [remote_exec host "$READELF -a tmpdir/bintest.o" "" "/dev/null" "tmpdir/bintest.o.out"]
+    if { [lindex $exec_output 0] != 0 } then {
+	unresolved "objcopy ($testname)"
+	return
+    }
+    set exec_output [prune_warnings [lindex $exec_output 1]]
     if ![string match "" $exec_output] then {
 	unresolved "objcopy ($testname)"
 	return
     }
 
     verbose -log "$READELF -a tmpdir/copy.o > tmpdir/copy.o.out"
-    catch "exec $READELF -a tmpdir/copy.o > tmpdir/copy.o.out" exec_output
-    set exec_output [prune_warnings $exec_output]
+    set exec_output [remote_exec host "$READELF -a tmpdir/copy.o" "" "/dev/null" "tmpdir/copy.o.out"]
+    if { [lindex $exec_output 0] != 0 } then {
+	unresolved "objcopy ($testname)"
+	return
+    }
+    set exec_output [prune_warnings [lindex $exec_output 1]]
     if ![string match "" $exec_output] then {
 	unresolved "objcopy ($testname)"
 	return
@@ -723,7 +933,61 @@ if { ([istarget "ia64-*-elf*"]
 if [is_elf_format] {
     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
+    run_dump_test "group-5"
+    run_dump_test "group-6"
+    run_dump_test "copy-1"
+    run_dump_test "note-1"
 }
 
-run_dump_test "copy-1"
 run_dump_test "copy-2"
+run_dump_test "copy-3"
+run_dump_test "copy-4"
+
+if [is_elf_format] {
+    run_dump_test "strip-1"
+    run_dump_test "strip-2"
+    run_dump_test "strip-3"
+    run_dump_test "strip-4"
+    run_dump_test "strip-5"
+    run_dump_test "strip-6"
+    run_dump_test "strip-7"
+    run_dump_test "strip-8"
+    run_dump_test "strip-9"
+    if { ![istarget "*-*-hpux*"]
+	 && ![istarget "msp*-*-*"] } {
+	run_dump_test "strip-10"
+    }
+
+    if { [istarget "i*86-*"] || [istarget "x86_64-*-*"] } {
+	# Check to make sure we don't strip a symbol named in relocations.
+	set test "objcopy keeps symbols needed by relocs"
+
+	set srcfile $srcdir/$subdir/needed-by-reloc.s
+
+	if {![binutils_assemble $srcfile tmpdir/bintest.o]} then {
+	    unresolved $test
+	} else {
+	    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS --strip-symbol=foo tmpdir/bintest.o ${copyfile}.o"]
+
+	    if [regexp "not stripping symbol `foo' because it is named in a relocation" $got] {
+		pass $test
+	    } else {
+		fail $test
+	    }
+	}
+    }
+
+    run_dump_test "localize-hidden-1"
+    run_dump_test "testranges"
+    run_dump_test "testranges-ia64"
+
+    run_dump_test "add-section"
+    run_dump_test "add-empty-section"
+
+    run_dump_test "exclude-1a"
+    run_dump_test "exclude-1b"
+}
+run_dump_test "localize-hidden-2"