X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-sh%2Fsh.exp;h=1fca64d861225e517fc121c8372d29526a0bb7bd;hb=44ed80923ab89e141120defa8c1209b69869a7ac;hp=45c8727b9d247c4554fb4cadd66a108ea466d7e5;hpb=787f6220773d9174a9675dedd3bbfc8f070511a6;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/ld-sh/sh.exp b/ld/testsuite/ld-sh/sh.exp index 45c8727b9d..1fca64d861 100644 --- a/ld/testsuite/ld-sh/sh.exp +++ b/ld/testsuite/ld-sh/sh.exp @@ -1,19 +1,22 @@ # Expect script for ld-sh tests -# Copyright (C) 1995, 1996 Free Software Foundation +# Copyright (C) 1995-2019 Free Software Foundation, Inc. # -# This file is free software; you can redistribute it and/or modify +# This file is part of the GNU Binutils. +# +# 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, # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. # # Written by Ian Lance Taylor (ian@cygnus.com) # @@ -29,10 +32,10 @@ set testsimple "SH simple relaxing" if ![ld_assemble $as "-relax $srcdir/$subdir/sh1.s" tmpdir/sh1.o] { unresolved $testsimple -} else { if ![ld_simple_link $ld tmpdir/sh1 "-relax tmpdir/sh1.o"] { +} else { if ![ld_link $ld tmpdir/sh1 "-relax tmpdir/sh1.o"] { fail $testsimple } else { - if ![ld_nm $nm tmpdir/sh1] { + if ![ld_nm $nm "" tmpdir/sh1] { unresolved $testsimple } else { if {![info exists nm_output(bar)] \ @@ -41,7 +44,7 @@ if ![ld_assemble $as "-relax $srcdir/$subdir/sh1.s" tmpdir/sh1.o] { verbose "bad output from nm" fail $testsimple } else { - if {$nm_output(bar) != $nm_output(foo) + 4} { + if {$nm_output(bar) != $nm_output(foo) + 0xc} { send_log "foo == $nm_output(foo)\n" verbose "foo == $nm_output(foo)" send_log "bar == $nm_output(bar)\n" @@ -56,7 +59,16 @@ if ![ld_assemble $as "-relax $srcdir/$subdir/sh1.s" tmpdir/sh1.o] { set testsrec "SH relaxing to S-records" -if ![ld_simple_link $ld tmpdir/sh1.s1 "-relax -oformat srec tmpdir/sh1.o"] { +if { [istarget sh*-linux-*] || [istarget sh-*-vxworks] } { + # On these "non-embedded" targets, the default ELF and srec start + # addresses will be SIZEOF_HEADERS bytes apart. Ensure consistency + # by feeding the ELF start address to the srec link line. + catch "exec $objdump -x tmpdir/sh1 | grep start\\ address | sed s/start\\ address//" entry_addr + set srec_relax_arg "-Ttext $entry_addr -relax --oformat srec tmpdir/sh1.o" +} else { + set srec_relax_arg "-relax --oformat srec tmpdir/sh1.o" +} +if ![ld_link $ld tmpdir/sh1.s1 $srec_relax_arg ] { fail $testsrec } else { # The file name is embedded in the S-records, so create both @@ -70,7 +82,7 @@ if ![ld_simple_link $ld tmpdir/sh1.s1 "-relax -oformat srec tmpdir/sh1.o"] { verbose "$exec_output" unresolved $testsrec } else { - send_log "$objcopy -O srec tmpdir/sh1 tmpdir/sh1.s1" + send_log "$objcopy -O srec tmpdir/sh1 tmpdir/sh1.s1\n" verbose "$objcopy -O srec tmpdir/sh1 tmpdir/sh1.s1" catch "exec $objcopy -O srec tmpdir/sh1 tmpdir/sh1.s1" exec_output if ![string match "" $exec_output] { @@ -81,7 +93,7 @@ if ![ld_simple_link $ld tmpdir/sh1.s1 "-relax -oformat srec tmpdir/sh1.o"] { send_log "cmp tmpdir/sh1.s1 tmpdir/sh1.s2\n" verbose "cmp tmpdir/sh1.s1 tmpdir/sh1.s2" catch "exec cmp tmpdir/sh1.s1 tmpdir/sh1.s2" exec_output - set exec_output [prune_system_crud $host_triplet $exec_output] + set exec_output [prune_warnings $exec_output] if ![string match "" $exec_output] { send_log "$exec_output\n" verbose "$exec_output" @@ -93,26 +105,53 @@ if ![ld_simple_link $ld tmpdir/sh1.s1 "-relax -oformat srec tmpdir/sh1.o"] { } } +set testadjsw8 "SH switch8 adjustment after relax" +if ![ld_assemble $as "-relax $srcdir/$subdir/adjsw8.s" tmpdir/adjsw8.o] { + unresolved $testadjsw8 +} else { + if ![ld_link $ld tmpdir/adjsw8 "-relax tmpdir/adjsw8.o"] { + fail $testadjsw8 + } else { + send_log "exec $objdump -s tmpdir/adjsw8\n" + verbose "exec $objdump -s tmpdir/adjsw8" + catch "exec $objdump -s tmpdir/adjsw8" exec_output + if [string match "*04080c00*" $exec_output] { + pass $testadjsw8 + } else { + send_log "bad switch table\n" + verbose "bad switch table" + fail $testadjsw8 + } + } +} + set testlink "SH relaxing" set testjsr "SH confirm relaxing" set testrun "SH relaxing execution" -if { [which $CC] == 0 } { +if { ![check_compiler_available] } { untested $testlink untested $testjsr untested $testrun return } -if {![ld_assemble $as "-relax $srcdir/$subdir/start.s" tmpdir/start.o] \ - || ![ld_compile $CC "-O -mrelax $srcdir/$subdir/sh2.c" tmpdir/sh2.o]} { +if [istarget sh*-*linux*] { + exec sed -e s/_main/main/ -e s/_trap/trap/ -e s/_stack/stack/ \ + < $srcdir/$subdir/start.s >tmpdir/start.s +} else { + exec cp $srcdir/$subdir/start.s tmpdir/start.s +} + +if {![ld_assemble $as "-relax tmpdir/start.s" tmpdir/start.o] \ + || ![ld_compile $CC "-O -mrelax -foptimize-sibling-calls $srcdir/$subdir/sh2.c" tmpdir/sh2.o]} { unresolved $testlink unresolved $testjsr unresolved $testrun return } -if ![ld_simple_link $ld tmpdir/sh2 "-relax tmpdir/start.o tmpdir/sh2.o"] { +if ![ld_link $ld tmpdir/sh2 "-relax tmpdir/start.o tmpdir/sh2.o"] { fail $testlink unresolved $testjsr unresolved $testrun @@ -124,7 +163,8 @@ pass $testlink send_log "$objdump -d tmpdir/sh2\n" verbose "$objdump -d tmpdir/sh2" catch "exec $objdump -d tmpdir/sh2" exec_output -if [string match "*jsr*" $exec_output] { +if {[string match "*jsr*" $exec_output] + || [string match "*jmp*" $exec_output]} { fail $testjsr } else { pass $testjsr