diff options
| -rw-r--r-- | gas/testsuite/.Sanitize | 28 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/.Sanitize | 28 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/mips.exp | 14 |
3 files changed, 66 insertions, 4 deletions
diff --git a/gas/testsuite/.Sanitize b/gas/testsuite/.Sanitize index 199827c..5b66057 100644 --- a/gas/testsuite/.Sanitize +++ b/gas/testsuite/.Sanitize @@ -100,4 +100,32 @@ else done fi +tx19_files="ChangeLog" +if ( echo $* | grep keep\-tx19 > /dev/null ) ; then + for i in $tx19_files ; do + if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Keeping tx19 stuff in $i + fi + fi + done +else + for i in $tx19_files ; do + if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"tx19\" from $i... + fi + cp $i new + sed '/start\-sanitize\-tx19/,/end-\sanitize\-tx19/d' < $i > new + if [ -n "${safe}" -a ! -f .Recover/$i ] ; then + if [ -n "${verbose}" ] ; then + echo Caching $i in .Recover... + fi + mv $i .Recover + fi + mv new $i + fi + done +fi + # End of file. diff --git a/gas/testsuite/gas/mips/.Sanitize b/gas/testsuite/gas/mips/.Sanitize index 9a06112..22deea6 100644 --- a/gas/testsuite/gas/mips/.Sanitize +++ b/gas/testsuite/gas/mips/.Sanitize @@ -117,4 +117,32 @@ Things-to-lose: Do-last: +tx19_files="mips.exp" +if ( echo $* | grep keep\-tx19 > /dev/null ) ; then + for i in $tx19_files ; do + if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Keeping tx19 stuff in $i + fi + fi + done +else + for i in $tx19_files ; do + if test ! -d $i && (grep sanitize-tx19 $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"tx19\" from $i... + fi + cp $i new + sed '/start\-sanitize\-tx19/,/end-\sanitize\-tx19/d' < $i > new + if [ -n "${safe}" -a ! -f .Recover/$i ] ; then + if [ -n "${verbose}" ] ; then + echo Caching $i in .Recover... + fi + mv $i .Recover + fi + mv new $i + fi + done +fi + # End of file. diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index 70ea89b..e4f55c4 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -2,10 +2,16 @@ # Some generic MIPS tests # if [istarget mips*-*-*] then { - set svr4pic [expr [istarget *-*-elf*] || [istarget *-*-irix5*] ] + set svr4pic [expr [istarget *-*-elf*] || [istarget *-*-irix5*] || [istarget *-*-irix6* ] ] set empic [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ] - set aout [expr [istarget *-*-bsd*] || [istarget *-*-netbsd*] || {istarget *-*-openbsd*]] - set ilocks [expr [istarget mips64vr4300*-*-*] || [istarget mips64vr4100*-*-*]] + set aout [expr [istarget *-*-bsd*] || [istarget *-*-netbsd*] || [istarget *-*-openbsd*]] + set ilocks [expr [istarget mips64vr4300*-*-*] || [istarget mips64vr4100*-*-*] || [istarget mipstx39*-*-*]] + set gpr_ilocks [expr [istarget mipstx39*-*-*]] + +# start-sanitize-tx19 + set ilocks [expr ilocks || [istarget mipstx19*-*-*]] + set gpr_ilocks [expr gpr_ilocks || [istarget mipstx19*-*-*]] +# end-sanitize-tx19 run_dump_test "abs" run_dump_test "add" @@ -29,7 +35,7 @@ if [istarget mips*-*-*] then { if $svr4pic { run_dump_test "lb-svr4pic" } if $svr4pic { run_dump_test "lb-xgot" } if $empic { run_dump_test "lb-empic" } - if !$aout { run_dump_test "ld" } + if !$aout { if !$gpr_ilocks { run_dump_test "ld" } else { run_dump_test "ld-ilocks" } } if $svr4pic { run_dump_test "ld-svr4pic" } if $svr4pic { run_dump_test "ld-xgot" } if $empic { run_dump_test "ld-empic" } |