[binutils-gdb] run_dump_test source in build directory

Alan Modra amodra@sourceware.org
Tue Jan 8 10:22:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=171b8e19575654ab32321eb99f3fd112663ae7fa

commit 171b8e19575654ab32321eb99f3fd112663ae7fa
Author: Alan Modra <amodra@gmail.com>
Date:   Tue Jan 8 16:47:52 2019 +1030

    run_dump_test source in build directory
    
    Some existing tests build .s and .d files for run_dump_test, using an
    absolute #source: line in the .d file.  This patch changes that scheme
    a little to instead use "#source: ./..." in .d files rather than
    "#source: $objdir/...", which is more useful in cases where the .d
    file is not generated.
    
    This allows RX gas test files to be built in the build directory,
    rather than in a source directory (which might be read-only).
    
    binutils/
    	* testsuite/lib/binutils-common.exp (run_dump_test): Don't prepend
    	$srcdir/$subdir to source file name if it starts with "./".
    gas/
    	* testsuite/gas/rx/rx.exp: Create generated test source in
    	current directory.
    	* testsuite/gas/rx/Xtod.d, * testsuite/gas/rx/abs.d,
    	* testsuite/gas/rx/adc.d, * testsuite/gas/rx/add.d,
    	* testsuite/gas/rx/and.d, * testsuite/gas/rx/bclr.d,
    	* testsuite/gas/rx/bcnd.d, * testsuite/gas/rx/bfmov.d,
    	* testsuite/gas/rx/bmcnd.d, * testsuite/gas/rx/bnot.d,
    	* testsuite/gas/rx/bra.d, * testsuite/gas/rx/brk.d,
    	* testsuite/gas/rx/bset.d, * testsuite/gas/rx/bsr.d,
    	* testsuite/gas/rx/btst.d, * testsuite/gas/rx/clrpsw.d,
    	* testsuite/gas/rx/cmp.d, * testsuite/gas/rx/dabs.d,
    	* testsuite/gas/rx/dadd.d, * testsuite/gas/rx/dbt.d,
    	* testsuite/gas/rx/dcmp.d, * testsuite/gas/rx/ddiv.d,
    	* testsuite/gas/rx/div.d, * testsuite/gas/rx/divu.d,
    	* testsuite/gas/rx/dmov.d, * testsuite/gas/rx/dmul.d,
    	* testsuite/gas/rx/dneg.d, * testsuite/gas/rx/dpopm.d,
    	* testsuite/gas/rx/dpushm.d, * testsuite/gas/rx/dround.d,
    	* testsuite/gas/rx/dsqrt.d, * testsuite/gas/rx/dsub.d,
    	* testsuite/gas/rx/dtoX.d, * testsuite/gas/rx/emaca.d,
    	* testsuite/gas/rx/emsba.d, * testsuite/gas/rx/emul.d,
    	* testsuite/gas/rx/emula.d, * testsuite/gas/rx/emulu.d,
    	* testsuite/gas/rx/fadd.d, * testsuite/gas/rx/fcmp.d,
    	* testsuite/gas/rx/fdiv.d, * testsuite/gas/rx/fmul.d,
    	* testsuite/gas/rx/fsqrt.d, * testsuite/gas/rx/fsub.d,
    	* testsuite/gas/rx/ftoi.d, * testsuite/gas/rx/ftou.d,
    	* testsuite/gas/rx/gprel.d, * testsuite/gas/rx/int.d,
    	* testsuite/gas/rx/itof.d, * testsuite/gas/rx/jmp.d,
    	* testsuite/gas/rx/jsr.d, * testsuite/gas/rx/machi.d,
    	* testsuite/gas/rx/maclh.d, * testsuite/gas/rx/maclo.d,
    	* testsuite/gas/rx/max.d, * testsuite/gas/rx/min.d,
    	* testsuite/gas/rx/mov.d, * testsuite/gas/rx/movco.d,
    	* testsuite/gas/rx/movli.d, * testsuite/gas/rx/movu.d,
    	* testsuite/gas/rx/msbhi.d, * testsuite/gas/rx/msblh.d,
    	* testsuite/gas/rx/msblo.d, * testsuite/gas/rx/mul.d,
    	* testsuite/gas/rx/mulhi.d, * testsuite/gas/rx/mullh.d,
    	* testsuite/gas/rx/mullo.d, * testsuite/gas/rx/mvfacgu.d,
    	* testsuite/gas/rx/mvfachi.d, * testsuite/gas/rx/mvfaclo.d,
    	* testsuite/gas/rx/mvfacmi.d, * testsuite/gas/rx/mvfc.d,
    	* testsuite/gas/rx/mvfcp.d, * testsuite/gas/rx/mvfdc.d,
    	* testsuite/gas/rx/mvfdr.d, * testsuite/gas/rx/mvtacgu.d,
    	* testsuite/gas/rx/mvtachi.d, * testsuite/gas/rx/mvtaclo.d,
    	* testsuite/gas/rx/mvtc.d, * testsuite/gas/rx/mvtcp.d,
    	* testsuite/gas/rx/mvtdc.d, * testsuite/gas/rx/neg.d,
    	* testsuite/gas/rx/nop.d, * testsuite/gas/rx/not.d,
    	* testsuite/gas/rx/opecp.d, * testsuite/gas/rx/or.d,
    	* testsuite/gas/rx/pop.d, * testsuite/gas/rx/popc.d,
    	* testsuite/gas/rx/popm.d, * testsuite/gas/rx/push.d,
    	* testsuite/gas/rx/pushc.d, * testsuite/gas/rx/pushm.d,
    	* testsuite/gas/rx/r-bcc.d, * testsuite/gas/rx/r-bra.d,
    	* testsuite/gas/rx/racl.d, * testsuite/gas/rx/racw.d,
    	* testsuite/gas/rx/rdacl.d, * testsuite/gas/rx/rdacw.d,
    	* testsuite/gas/rx/revl.d, * testsuite/gas/rx/revw.d,
    	* testsuite/gas/rx/rmpa.d, * testsuite/gas/rx/rolc.d,
    	* testsuite/gas/rx/rorc.d, * testsuite/gas/rx/rotl.d,
    	* testsuite/gas/rx/rotr.d, * testsuite/gas/rx/round.d,
    	* testsuite/gas/rx/rstr.d, * testsuite/gas/rx/rte.d,
    	* testsuite/gas/rx/rtfi.d, * testsuite/gas/rx/rts.d,
    	* testsuite/gas/rx/rtsd.d, * testsuite/gas/rx/sat.d,
    	* testsuite/gas/rx/satr.d, * testsuite/gas/rx/save.d,
    	* testsuite/gas/rx/sbb.d, * testsuite/gas/rx/sccnd.d,
    	* testsuite/gas/rx/scmpu.d, * testsuite/gas/rx/setpsw.d,
    	* testsuite/gas/rx/shar.d, * testsuite/gas/rx/shll.d,
    	* testsuite/gas/rx/shlr.d, * testsuite/gas/rx/smovb.d,
    	* testsuite/gas/rx/smovf.d, * testsuite/gas/rx/smovu.d,
    	* testsuite/gas/rx/sstr.d, * testsuite/gas/rx/stnz.d,
    	* testsuite/gas/rx/stz.d, * testsuite/gas/rx/sub.d,
    	* testsuite/gas/rx/suntil.d, * testsuite/gas/rx/swhile.d,
    	* testsuite/gas/rx/tst.d, * testsuite/gas/rx/utof.d,
    	* testsuite/gas/rx/wait.d, * testsuite/gas/rx/xchg.d,
    	* testsuite/gas/rx/xor.d: Add #source line.
    ld/
    	* testsuite/ld-elf/sec64k.exp: Use . rather than $objdir in
    	generated source file names.
    	* testsuite/ld-m68k/m68k-got.exp: Likewise.

Diff:
---
 binutils/ChangeLog                         |  8 +++-
 binutils/testsuite/lib/binutils-common.exp |  2 +-
 gas/ChangeLog                              | 73 ++++++++++++++++++++++++++++++
 gas/testsuite/gas/rx/Xtod.d                |  1 +
 gas/testsuite/gas/rx/abs.d                 |  1 +
 gas/testsuite/gas/rx/adc.d                 |  1 +
 gas/testsuite/gas/rx/add.d                 |  1 +
 gas/testsuite/gas/rx/and.d                 |  1 +
 gas/testsuite/gas/rx/bclr.d                |  1 +
 gas/testsuite/gas/rx/bcnd.d                |  1 +
 gas/testsuite/gas/rx/bfmov.d               |  1 +
 gas/testsuite/gas/rx/bmcnd.d               |  1 +
 gas/testsuite/gas/rx/bnot.d                |  1 +
 gas/testsuite/gas/rx/bra.d                 |  1 +
 gas/testsuite/gas/rx/brk.d                 |  1 +
 gas/testsuite/gas/rx/bset.d                |  1 +
 gas/testsuite/gas/rx/bsr.d                 |  1 +
 gas/testsuite/gas/rx/btst.d                |  1 +
 gas/testsuite/gas/rx/clrpsw.d              |  1 +
 gas/testsuite/gas/rx/cmp.d                 |  1 +
 gas/testsuite/gas/rx/dabs.d                |  1 +
 gas/testsuite/gas/rx/dadd.d                |  1 +
 gas/testsuite/gas/rx/dbt.d                 |  1 +
 gas/testsuite/gas/rx/dcmp.d                |  1 +
 gas/testsuite/gas/rx/ddiv.d                |  1 +
 gas/testsuite/gas/rx/div.d                 |  1 +
 gas/testsuite/gas/rx/divu.d                |  1 +
 gas/testsuite/gas/rx/dmov.d                |  1 +
 gas/testsuite/gas/rx/dmul.d                |  1 +
 gas/testsuite/gas/rx/dneg.d                |  1 +
 gas/testsuite/gas/rx/dpopm.d               |  1 +
 gas/testsuite/gas/rx/dpushm.d              |  1 +
 gas/testsuite/gas/rx/dround.d              |  1 +
 gas/testsuite/gas/rx/dsqrt.d               |  1 +
 gas/testsuite/gas/rx/dsub.d                |  1 +
 gas/testsuite/gas/rx/dtoX.d                |  1 +
 gas/testsuite/gas/rx/emaca.d               |  1 +
 gas/testsuite/gas/rx/emsba.d               |  1 +
 gas/testsuite/gas/rx/emul.d                |  1 +
 gas/testsuite/gas/rx/emula.d               |  1 +
 gas/testsuite/gas/rx/emulu.d               |  1 +
 gas/testsuite/gas/rx/fadd.d                |  1 +
 gas/testsuite/gas/rx/fcmp.d                |  1 +
 gas/testsuite/gas/rx/fdiv.d                |  1 +
 gas/testsuite/gas/rx/fmul.d                |  1 +
 gas/testsuite/gas/rx/fsqrt.d               |  1 +
 gas/testsuite/gas/rx/fsub.d                |  1 +
 gas/testsuite/gas/rx/ftoi.d                |  1 +
 gas/testsuite/gas/rx/ftou.d                |  1 +
 gas/testsuite/gas/rx/gprel.d               |  1 +
 gas/testsuite/gas/rx/int.d                 |  1 +
 gas/testsuite/gas/rx/itof.d                |  1 +
 gas/testsuite/gas/rx/jmp.d                 |  1 +
 gas/testsuite/gas/rx/jsr.d                 |  1 +
 gas/testsuite/gas/rx/machi.d               |  1 +
 gas/testsuite/gas/rx/maclh.d               |  1 +
 gas/testsuite/gas/rx/maclo.d               |  1 +
 gas/testsuite/gas/rx/max.d                 |  1 +
 gas/testsuite/gas/rx/min.d                 |  1 +
 gas/testsuite/gas/rx/mov.d                 |  1 +
 gas/testsuite/gas/rx/movco.d               |  1 +
 gas/testsuite/gas/rx/movli.d               |  1 +
 gas/testsuite/gas/rx/movu.d                |  1 +
 gas/testsuite/gas/rx/msbhi.d               |  1 +
 gas/testsuite/gas/rx/msblh.d               |  1 +
 gas/testsuite/gas/rx/msblo.d               |  1 +
 gas/testsuite/gas/rx/mul.d                 |  1 +
 gas/testsuite/gas/rx/mulhi.d               |  1 +
 gas/testsuite/gas/rx/mullh.d               |  1 +
 gas/testsuite/gas/rx/mullo.d               |  1 +
 gas/testsuite/gas/rx/mvfacgu.d             |  1 +
 gas/testsuite/gas/rx/mvfachi.d             |  1 +
 gas/testsuite/gas/rx/mvfaclo.d             |  1 +
 gas/testsuite/gas/rx/mvfacmi.d             |  1 +
 gas/testsuite/gas/rx/mvfc.d                |  1 +
 gas/testsuite/gas/rx/mvfcp.d               |  1 +
 gas/testsuite/gas/rx/mvfdc.d               |  1 +
 gas/testsuite/gas/rx/mvfdr.d               |  1 +
 gas/testsuite/gas/rx/mvtacgu.d             |  1 +
 gas/testsuite/gas/rx/mvtachi.d             |  1 +
 gas/testsuite/gas/rx/mvtaclo.d             |  1 +
 gas/testsuite/gas/rx/mvtc.d                |  1 +
 gas/testsuite/gas/rx/mvtcp.d               |  1 +
 gas/testsuite/gas/rx/mvtdc.d               |  1 +
 gas/testsuite/gas/rx/neg.d                 |  1 +
 gas/testsuite/gas/rx/nop.d                 |  1 +
 gas/testsuite/gas/rx/not.d                 |  1 +
 gas/testsuite/gas/rx/opecp.d               |  1 +
 gas/testsuite/gas/rx/or.d                  |  1 +
 gas/testsuite/gas/rx/pop.d                 |  1 +
 gas/testsuite/gas/rx/popc.d                |  1 +
 gas/testsuite/gas/rx/popm.d                |  1 +
 gas/testsuite/gas/rx/push.d                |  1 +
 gas/testsuite/gas/rx/pushc.d               |  1 +
 gas/testsuite/gas/rx/pushm.d               |  1 +
 gas/testsuite/gas/rx/r-bcc.d               |  1 +
 gas/testsuite/gas/rx/r-bra.d               |  1 +
 gas/testsuite/gas/rx/racl.d                |  1 +
 gas/testsuite/gas/rx/racw.d                |  1 +
 gas/testsuite/gas/rx/rdacl.d               |  1 +
 gas/testsuite/gas/rx/rdacw.d               |  1 +
 gas/testsuite/gas/rx/revl.d                |  1 +
 gas/testsuite/gas/rx/revw.d                |  1 +
 gas/testsuite/gas/rx/rmpa.d                |  1 +
 gas/testsuite/gas/rx/rolc.d                |  1 +
 gas/testsuite/gas/rx/rorc.d                |  1 +
 gas/testsuite/gas/rx/rotl.d                |  1 +
 gas/testsuite/gas/rx/rotr.d                |  1 +
 gas/testsuite/gas/rx/round.d               |  1 +
 gas/testsuite/gas/rx/rstr.d                |  1 +
 gas/testsuite/gas/rx/rte.d                 |  1 +
 gas/testsuite/gas/rx/rtfi.d                |  1 +
 gas/testsuite/gas/rx/rts.d                 |  1 +
 gas/testsuite/gas/rx/rtsd.d                |  1 +
 gas/testsuite/gas/rx/rx.exp                |  4 +-
 gas/testsuite/gas/rx/sat.d                 |  1 +
 gas/testsuite/gas/rx/satr.d                |  1 +
 gas/testsuite/gas/rx/save.d                |  1 +
 gas/testsuite/gas/rx/sbb.d                 |  1 +
 gas/testsuite/gas/rx/sccnd.d               |  1 +
 gas/testsuite/gas/rx/scmpu.d               |  1 +
 gas/testsuite/gas/rx/setpsw.d              |  1 +
 gas/testsuite/gas/rx/shar.d                |  1 +
 gas/testsuite/gas/rx/shll.d                |  1 +
 gas/testsuite/gas/rx/shlr.d                |  1 +
 gas/testsuite/gas/rx/smovb.d               |  1 +
 gas/testsuite/gas/rx/smovf.d               |  1 +
 gas/testsuite/gas/rx/smovu.d               |  1 +
 gas/testsuite/gas/rx/sstr.d                |  1 +
 gas/testsuite/gas/rx/stnz.d                |  1 +
 gas/testsuite/gas/rx/stz.d                 |  1 +
 gas/testsuite/gas/rx/sub.d                 |  1 +
 gas/testsuite/gas/rx/suntil.d              |  1 +
 gas/testsuite/gas/rx/swhile.d              |  1 +
 gas/testsuite/gas/rx/tst.d                 |  1 +
 gas/testsuite/gas/rx/utof.d                |  1 +
 gas/testsuite/gas/rx/wait.d                |  1 +
 gas/testsuite/gas/rx/xchg.d                |  1 +
 gas/testsuite/gas/rx/xor.d                 |  1 +
 ld/ChangeLog                               |  6 +++
 ld/testsuite/ld-elf/sec64k.exp             |  2 +-
 ld/testsuite/ld-m68k/m68k-got.exp          | 52 ++++++++++-----------
 142 files changed, 251 insertions(+), 31 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d7f1685..d64f510 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,4 +1,10 @@
-2018-12-25  Yoshinori Sato <ysato@users.sourceforge.jp>
+2019-01-08  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/lib/binutils-common.exp (run_dump_test): Don't prepend
+	$srcdir/$subdir to source file name if it starts with "./".
+
+2019-01-05  Yoshinori Sato <ysato@users.sourceforge.jp>
+
 	* readelf.c (get_machine_flags): Add RXv3 output.
 
 2019-01-04  Nick Clifton  <nickc@redhat.com>
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index afe21fa..213e53f 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -928,7 +928,7 @@ proc run_dump_test { name {extra_options {}} } {
     } else {
 	set sourcefiles {}
 	foreach sf $opts(source) {
-	    if { [string match "/*" $sf] } {
+	    if { [string match "./*" $sf] } {
 		lappend sourcefiles "$sf"
 	    } else {
 		lappend sourcefiles "$srcdir/$subdir/$sf"
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 604ff42..6deda0a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,76 @@
+2019-01-08  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/gas/rx/rx.exp: Create generated test source in
+	current directory.
+	* testsuite/gas/rx/Xtod.d, * testsuite/gas/rx/abs.d,
+	* testsuite/gas/rx/adc.d, * testsuite/gas/rx/add.d,
+	* testsuite/gas/rx/and.d, * testsuite/gas/rx/bclr.d,
+	* testsuite/gas/rx/bcnd.d, * testsuite/gas/rx/bfmov.d,
+	* testsuite/gas/rx/bmcnd.d, * testsuite/gas/rx/bnot.d,
+	* testsuite/gas/rx/bra.d, * testsuite/gas/rx/brk.d,
+	* testsuite/gas/rx/bset.d, * testsuite/gas/rx/bsr.d,
+	* testsuite/gas/rx/btst.d, * testsuite/gas/rx/clrpsw.d,
+	* testsuite/gas/rx/cmp.d, * testsuite/gas/rx/dabs.d,
+	* testsuite/gas/rx/dadd.d, * testsuite/gas/rx/dbt.d,
+	* testsuite/gas/rx/dcmp.d, * testsuite/gas/rx/ddiv.d,
+	* testsuite/gas/rx/div.d, * testsuite/gas/rx/divu.d,
+	* testsuite/gas/rx/dmov.d, * testsuite/gas/rx/dmul.d,
+	* testsuite/gas/rx/dneg.d, * testsuite/gas/rx/dpopm.d,
+	* testsuite/gas/rx/dpushm.d, * testsuite/gas/rx/dround.d,
+	* testsuite/gas/rx/dsqrt.d, * testsuite/gas/rx/dsub.d,
+	* testsuite/gas/rx/dtoX.d, * testsuite/gas/rx/emaca.d,
+	* testsuite/gas/rx/emsba.d, * testsuite/gas/rx/emul.d,
+	* testsuite/gas/rx/emula.d, * testsuite/gas/rx/emulu.d,
+	* testsuite/gas/rx/fadd.d, * testsuite/gas/rx/fcmp.d,
+	* testsuite/gas/rx/fdiv.d, * testsuite/gas/rx/fmul.d,
+	* testsuite/gas/rx/fsqrt.d, * testsuite/gas/rx/fsub.d,
+	* testsuite/gas/rx/ftoi.d, * testsuite/gas/rx/ftou.d,
+	* testsuite/gas/rx/gprel.d, * testsuite/gas/rx/int.d,
+	* testsuite/gas/rx/itof.d, * testsuite/gas/rx/jmp.d,
+	* testsuite/gas/rx/jsr.d, * testsuite/gas/rx/machi.d,
+	* testsuite/gas/rx/maclh.d, * testsuite/gas/rx/maclo.d,
+	* testsuite/gas/rx/max.d, * testsuite/gas/rx/min.d,
+	* testsuite/gas/rx/mov.d, * testsuite/gas/rx/movco.d,
+	* testsuite/gas/rx/movli.d, * testsuite/gas/rx/movu.d,
+	* testsuite/gas/rx/msbhi.d, * testsuite/gas/rx/msblh.d,
+	* testsuite/gas/rx/msblo.d, * testsuite/gas/rx/mul.d,
+	* testsuite/gas/rx/mulhi.d, * testsuite/gas/rx/mullh.d,
+	* testsuite/gas/rx/mullo.d, * testsuite/gas/rx/mvfacgu.d,
+	* testsuite/gas/rx/mvfachi.d, * testsuite/gas/rx/mvfaclo.d,
+	* testsuite/gas/rx/mvfacmi.d, * testsuite/gas/rx/mvfc.d,
+	* testsuite/gas/rx/mvfcp.d, * testsuite/gas/rx/mvfdc.d,
+	* testsuite/gas/rx/mvfdr.d, * testsuite/gas/rx/mvtacgu.d,
+	* testsuite/gas/rx/mvtachi.d, * testsuite/gas/rx/mvtaclo.d,
+	* testsuite/gas/rx/mvtc.d, * testsuite/gas/rx/mvtcp.d,
+	* testsuite/gas/rx/mvtdc.d, * testsuite/gas/rx/neg.d,
+	* testsuite/gas/rx/nop.d, * testsuite/gas/rx/not.d,
+	* testsuite/gas/rx/opecp.d, * testsuite/gas/rx/or.d,
+	* testsuite/gas/rx/pop.d, * testsuite/gas/rx/popc.d,
+	* testsuite/gas/rx/popm.d, * testsuite/gas/rx/push.d,
+	* testsuite/gas/rx/pushc.d, * testsuite/gas/rx/pushm.d,
+	* testsuite/gas/rx/r-bcc.d, * testsuite/gas/rx/r-bra.d,
+	* testsuite/gas/rx/racl.d, * testsuite/gas/rx/racw.d,
+	* testsuite/gas/rx/rdacl.d, * testsuite/gas/rx/rdacw.d,
+	* testsuite/gas/rx/revl.d, * testsuite/gas/rx/revw.d,
+	* testsuite/gas/rx/rmpa.d, * testsuite/gas/rx/rolc.d,
+	* testsuite/gas/rx/rorc.d, * testsuite/gas/rx/rotl.d,
+	* testsuite/gas/rx/rotr.d, * testsuite/gas/rx/round.d,
+	* testsuite/gas/rx/rstr.d, * testsuite/gas/rx/rte.d,
+	* testsuite/gas/rx/rtfi.d, * testsuite/gas/rx/rts.d,
+	* testsuite/gas/rx/rtsd.d, * testsuite/gas/rx/sat.d,
+	* testsuite/gas/rx/satr.d, * testsuite/gas/rx/save.d,
+	* testsuite/gas/rx/sbb.d, * testsuite/gas/rx/sccnd.d,
+	* testsuite/gas/rx/scmpu.d, * testsuite/gas/rx/setpsw.d,
+	* testsuite/gas/rx/shar.d, * testsuite/gas/rx/shll.d,
+	* testsuite/gas/rx/shlr.d, * testsuite/gas/rx/smovb.d,
+	* testsuite/gas/rx/smovf.d, * testsuite/gas/rx/smovu.d,
+	* testsuite/gas/rx/sstr.d, * testsuite/gas/rx/stnz.d,
+	* testsuite/gas/rx/stz.d, * testsuite/gas/rx/sub.d,
+	* testsuite/gas/rx/suntil.d, * testsuite/gas/rx/swhile.d,
+	* testsuite/gas/rx/tst.d, * testsuite/gas/rx/utof.d,
+	* testsuite/gas/rx/wait.d, * testsuite/gas/rx/xchg.d,
+	* testsuite/gas/rx/xor.d: Add #source line.
+
 2019-01-07  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/tc-arm.c (arm_cpus): Add ares.
diff --git a/gas/testsuite/gas/rx/Xtod.d b/gas/testsuite/gas/rx/Xtod.d
index 8bf444b..6944bde 100644
--- a/gas/testsuite/gas/rx/Xtod.d
+++ b/gas/testsuite/gas/rx/Xtod.d
@@ -1,3 +1,4 @@
+#source: ./Xtod.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/abs.d b/gas/testsuite/gas/rx/abs.d
index d690b00..f94b2ae 100644
--- a/gas/testsuite/gas/rx/abs.d
+++ b/gas/testsuite/gas/rx/abs.d
@@ -1,3 +1,4 @@
+#source: ./abs.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/adc.d b/gas/testsuite/gas/rx/adc.d
index 63fe4b7..4e7ae95 100644
--- a/gas/testsuite/gas/rx/adc.d
+++ b/gas/testsuite/gas/rx/adc.d
@@ -1,3 +1,4 @@
+#source: ./adc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/add.d b/gas/testsuite/gas/rx/add.d
index d2482f5..54fbe82 100644
--- a/gas/testsuite/gas/rx/add.d
+++ b/gas/testsuite/gas/rx/add.d
@@ -1,3 +1,4 @@
+#source: ./add.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/and.d b/gas/testsuite/gas/rx/and.d
index ed44614..11c0310 100644
--- a/gas/testsuite/gas/rx/and.d
+++ b/gas/testsuite/gas/rx/and.d
@@ -1,3 +1,4 @@
+#source: ./and.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bclr.d b/gas/testsuite/gas/rx/bclr.d
index fb2033f..94905a6 100644
--- a/gas/testsuite/gas/rx/bclr.d
+++ b/gas/testsuite/gas/rx/bclr.d
@@ -1,3 +1,4 @@
+#source: ./bclr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bcnd.d b/gas/testsuite/gas/rx/bcnd.d
index 72b15c2..d88ed69 100644
--- a/gas/testsuite/gas/rx/bcnd.d
+++ b/gas/testsuite/gas/rx/bcnd.d
@@ -1,3 +1,4 @@
+#source: ./bcnd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bfmov.d b/gas/testsuite/gas/rx/bfmov.d
index 9d61ff8..023f043 100644
--- a/gas/testsuite/gas/rx/bfmov.d
+++ b/gas/testsuite/gas/rx/bfmov.d
@@ -1,3 +1,4 @@
+#source: ./bfmov.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bmcnd.d b/gas/testsuite/gas/rx/bmcnd.d
index 2c1df45..ce9edb6 100644
--- a/gas/testsuite/gas/rx/bmcnd.d
+++ b/gas/testsuite/gas/rx/bmcnd.d
@@ -1,3 +1,4 @@
+#source: ./bmcnd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bnot.d b/gas/testsuite/gas/rx/bnot.d
index 1e4c774..35b7ec5 100644
--- a/gas/testsuite/gas/rx/bnot.d
+++ b/gas/testsuite/gas/rx/bnot.d
@@ -1,3 +1,4 @@
+#source: ./bnot.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bra.d b/gas/testsuite/gas/rx/bra.d
index 710fa76..ee14bb4 100644
--- a/gas/testsuite/gas/rx/bra.d
+++ b/gas/testsuite/gas/rx/bra.d
@@ -1,3 +1,4 @@
+#source: ./bra.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/brk.d b/gas/testsuite/gas/rx/brk.d
index cbe0892..e2f0c65 100644
--- a/gas/testsuite/gas/rx/brk.d
+++ b/gas/testsuite/gas/rx/brk.d
@@ -1,3 +1,4 @@
+#source: ./brk.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bset.d b/gas/testsuite/gas/rx/bset.d
index 818dc0b..8699b2f 100644
--- a/gas/testsuite/gas/rx/bset.d
+++ b/gas/testsuite/gas/rx/bset.d
@@ -1,3 +1,4 @@
+#source: ./bset.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/bsr.d b/gas/testsuite/gas/rx/bsr.d
index ee6ab15..860ca7b 100644
--- a/gas/testsuite/gas/rx/bsr.d
+++ b/gas/testsuite/gas/rx/bsr.d
@@ -1,3 +1,4 @@
+#source: ./bsr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/btst.d b/gas/testsuite/gas/rx/btst.d
index 3f1459f..898d323 100644
--- a/gas/testsuite/gas/rx/btst.d
+++ b/gas/testsuite/gas/rx/btst.d
@@ -1,3 +1,4 @@
+#source: ./btst.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/clrpsw.d b/gas/testsuite/gas/rx/clrpsw.d
index 20678b5..c8580aa 100644
--- a/gas/testsuite/gas/rx/clrpsw.d
+++ b/gas/testsuite/gas/rx/clrpsw.d
@@ -1,3 +1,4 @@
+#source: ./clrpsw.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/cmp.d b/gas/testsuite/gas/rx/cmp.d
index c1317f4..0bc3f6e 100644
--- a/gas/testsuite/gas/rx/cmp.d
+++ b/gas/testsuite/gas/rx/cmp.d
@@ -1,3 +1,4 @@
+#source: ./cmp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dabs.d b/gas/testsuite/gas/rx/dabs.d
index 48762d8..730f53d 100644
--- a/gas/testsuite/gas/rx/dabs.d
+++ b/gas/testsuite/gas/rx/dabs.d
@@ -1,3 +1,4 @@
+#source: ./dabs.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dadd.d b/gas/testsuite/gas/rx/dadd.d
index 8f948fe..1db0829 100644
--- a/gas/testsuite/gas/rx/dadd.d
+++ b/gas/testsuite/gas/rx/dadd.d
@@ -1,3 +1,4 @@
+#source: ./dadd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dbt.d b/gas/testsuite/gas/rx/dbt.d
index d3dbd61..c104801 100644
--- a/gas/testsuite/gas/rx/dbt.d
+++ b/gas/testsuite/gas/rx/dbt.d
@@ -1,3 +1,4 @@
+#source: ./dbt.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dcmp.d b/gas/testsuite/gas/rx/dcmp.d
index bf7bc06..93d9c4e 100644
--- a/gas/testsuite/gas/rx/dcmp.d
+++ b/gas/testsuite/gas/rx/dcmp.d
@@ -1,3 +1,4 @@
+#source: ./dcmp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/ddiv.d b/gas/testsuite/gas/rx/ddiv.d
index f40dc5b..589a043 100644
--- a/gas/testsuite/gas/rx/ddiv.d
+++ b/gas/testsuite/gas/rx/ddiv.d
@@ -1,3 +1,4 @@
+#source: ./ddiv.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/div.d b/gas/testsuite/gas/rx/div.d
index 0d7f5b0..dcaaa3d 100644
--- a/gas/testsuite/gas/rx/div.d
+++ b/gas/testsuite/gas/rx/div.d
@@ -1,3 +1,4 @@
+#source: ./div.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/divu.d b/gas/testsuite/gas/rx/divu.d
index 4b06415..d0fd9e1 100644
--- a/gas/testsuite/gas/rx/divu.d
+++ b/gas/testsuite/gas/rx/divu.d
@@ -1,3 +1,4 @@
+#source: ./divu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dmov.d b/gas/testsuite/gas/rx/dmov.d
index 2e5ecdb..75fd0e0 100644
--- a/gas/testsuite/gas/rx/dmov.d
+++ b/gas/testsuite/gas/rx/dmov.d
@@ -1,3 +1,4 @@
+#source: ./dmov.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dmul.d b/gas/testsuite/gas/rx/dmul.d
index 4247635..4f515c0 100644
--- a/gas/testsuite/gas/rx/dmul.d
+++ b/gas/testsuite/gas/rx/dmul.d
@@ -1,3 +1,4 @@
+#source: ./dmul.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dneg.d b/gas/testsuite/gas/rx/dneg.d
index 9511e79..df1a790 100644
--- a/gas/testsuite/gas/rx/dneg.d
+++ b/gas/testsuite/gas/rx/dneg.d
@@ -1,3 +1,4 @@
+#source: ./dneg.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dpopm.d b/gas/testsuite/gas/rx/dpopm.d
index 34e6917..2744124 100644
--- a/gas/testsuite/gas/rx/dpopm.d
+++ b/gas/testsuite/gas/rx/dpopm.d
@@ -1,3 +1,4 @@
+#source: ./dpopm.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dpushm.d b/gas/testsuite/gas/rx/dpushm.d
index d5a51d0..c5b39ed 100644
--- a/gas/testsuite/gas/rx/dpushm.d
+++ b/gas/testsuite/gas/rx/dpushm.d
@@ -1,3 +1,4 @@
+#source: ./dpushm.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dround.d b/gas/testsuite/gas/rx/dround.d
index e88d39e..63c8bf5 100644
--- a/gas/testsuite/gas/rx/dround.d
+++ b/gas/testsuite/gas/rx/dround.d
@@ -1,3 +1,4 @@
+#source: ./dround.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dsqrt.d b/gas/testsuite/gas/rx/dsqrt.d
index 91a769c..e3ea79d 100644
--- a/gas/testsuite/gas/rx/dsqrt.d
+++ b/gas/testsuite/gas/rx/dsqrt.d
@@ -1,3 +1,4 @@
+#source: ./dsqrt.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dsub.d b/gas/testsuite/gas/rx/dsub.d
index 939850e..6a126d2 100644
--- a/gas/testsuite/gas/rx/dsub.d
+++ b/gas/testsuite/gas/rx/dsub.d
@@ -1,3 +1,4 @@
+#source: ./dsub.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/dtoX.d b/gas/testsuite/gas/rx/dtoX.d
index 8d7c5ea..da07780 100644
--- a/gas/testsuite/gas/rx/dtoX.d
+++ b/gas/testsuite/gas/rx/dtoX.d
@@ -1,3 +1,4 @@
+#source: ./dtoX.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/emaca.d b/gas/testsuite/gas/rx/emaca.d
index 05edcc0..c2381a6 100644
--- a/gas/testsuite/gas/rx/emaca.d
+++ b/gas/testsuite/gas/rx/emaca.d
@@ -1,3 +1,4 @@
+#source: ./emaca.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/emsba.d b/gas/testsuite/gas/rx/emsba.d
index a5fdc10..771616b 100644
--- a/gas/testsuite/gas/rx/emsba.d
+++ b/gas/testsuite/gas/rx/emsba.d
@@ -1,3 +1,4 @@
+#source: ./emsba.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/emul.d b/gas/testsuite/gas/rx/emul.d
index c7f2751..32d21d2 100644
--- a/gas/testsuite/gas/rx/emul.d
+++ b/gas/testsuite/gas/rx/emul.d
@@ -1,3 +1,4 @@
+#source: ./emul.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/emula.d b/gas/testsuite/gas/rx/emula.d
index 82fd3f5..bddc26d 100644
--- a/gas/testsuite/gas/rx/emula.d
+++ b/gas/testsuite/gas/rx/emula.d
@@ -1,3 +1,4 @@
+#source: ./emula.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/emulu.d b/gas/testsuite/gas/rx/emulu.d
index aecc53a..33b1ce3 100644
--- a/gas/testsuite/gas/rx/emulu.d
+++ b/gas/testsuite/gas/rx/emulu.d
@@ -1,3 +1,4 @@
+#source: ./emulu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fadd.d b/gas/testsuite/gas/rx/fadd.d
index a7f9e02..d862423 100644
--- a/gas/testsuite/gas/rx/fadd.d
+++ b/gas/testsuite/gas/rx/fadd.d
@@ -1,3 +1,4 @@
+#source: ./fadd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fcmp.d b/gas/testsuite/gas/rx/fcmp.d
index 4e0743c..2749db4 100644
--- a/gas/testsuite/gas/rx/fcmp.d
+++ b/gas/testsuite/gas/rx/fcmp.d
@@ -1,3 +1,4 @@
+#source: ./fcmp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fdiv.d b/gas/testsuite/gas/rx/fdiv.d
index a87103e..9047e50 100644
--- a/gas/testsuite/gas/rx/fdiv.d
+++ b/gas/testsuite/gas/rx/fdiv.d
@@ -1,3 +1,4 @@
+#source: ./fdiv.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fmul.d b/gas/testsuite/gas/rx/fmul.d
index fab094f..5ff57ee 100644
--- a/gas/testsuite/gas/rx/fmul.d
+++ b/gas/testsuite/gas/rx/fmul.d
@@ -1,3 +1,4 @@
+#source: ./fmul.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fsqrt.d b/gas/testsuite/gas/rx/fsqrt.d
index 6005f3f..f176fed 100644
--- a/gas/testsuite/gas/rx/fsqrt.d
+++ b/gas/testsuite/gas/rx/fsqrt.d
@@ -1,3 +1,4 @@
+#source: ./fsqrt.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/fsub.d b/gas/testsuite/gas/rx/fsub.d
index 797f018..e92432a 100644
--- a/gas/testsuite/gas/rx/fsub.d
+++ b/gas/testsuite/gas/rx/fsub.d
@@ -1,3 +1,4 @@
+#source: ./fsub.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/ftoi.d b/gas/testsuite/gas/rx/ftoi.d
index 348f1f0..bad9a63 100644
--- a/gas/testsuite/gas/rx/ftoi.d
+++ b/gas/testsuite/gas/rx/ftoi.d
@@ -1,3 +1,4 @@
+#source: ./ftoi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/ftou.d b/gas/testsuite/gas/rx/ftou.d
index 6bc2d33..b0aac89 100644
--- a/gas/testsuite/gas/rx/ftou.d
+++ b/gas/testsuite/gas/rx/ftou.d
@@ -1,3 +1,4 @@
+#source: ./ftou.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/gprel.d b/gas/testsuite/gas/rx/gprel.d
index 1de0d7d..ce5d81f 100644
--- a/gas/testsuite/gas/rx/gprel.d
+++ b/gas/testsuite/gas/rx/gprel.d
@@ -1,3 +1,4 @@
+#source: ./gprel.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/int.d b/gas/testsuite/gas/rx/int.d
index 3b09b44..00776cb 100644
--- a/gas/testsuite/gas/rx/int.d
+++ b/gas/testsuite/gas/rx/int.d
@@ -1,3 +1,4 @@
+#source: ./int.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/itof.d b/gas/testsuite/gas/rx/itof.d
index 901484c..242eebd 100644
--- a/gas/testsuite/gas/rx/itof.d
+++ b/gas/testsuite/gas/rx/itof.d
@@ -1,3 +1,4 @@
+#source: ./itof.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/jmp.d b/gas/testsuite/gas/rx/jmp.d
index cfaeb1f..1f98d8a 100644
--- a/gas/testsuite/gas/rx/jmp.d
+++ b/gas/testsuite/gas/rx/jmp.d
@@ -1,3 +1,4 @@
+#source: ./jmp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/jsr.d b/gas/testsuite/gas/rx/jsr.d
index 20b81d8..160e6ec 100644
--- a/gas/testsuite/gas/rx/jsr.d
+++ b/gas/testsuite/gas/rx/jsr.d
@@ -1,3 +1,4 @@
+#source: ./jsr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/machi.d b/gas/testsuite/gas/rx/machi.d
index 384955a..3c5a29b 100644
--- a/gas/testsuite/gas/rx/machi.d
+++ b/gas/testsuite/gas/rx/machi.d
@@ -1,3 +1,4 @@
+#source: ./machi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/maclh.d b/gas/testsuite/gas/rx/maclh.d
index 2b7aece..1cb1b15 100644
--- a/gas/testsuite/gas/rx/maclh.d
+++ b/gas/testsuite/gas/rx/maclh.d
@@ -1,3 +1,4 @@
+#source: ./maclh.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/maclo.d b/gas/testsuite/gas/rx/maclo.d
index 9bf9051..64863df 100644
--- a/gas/testsuite/gas/rx/maclo.d
+++ b/gas/testsuite/gas/rx/maclo.d
@@ -1,3 +1,4 @@
+#source: ./maclo.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/max.d b/gas/testsuite/gas/rx/max.d
index 7f20650..3d8c116 100644
--- a/gas/testsuite/gas/rx/max.d
+++ b/gas/testsuite/gas/rx/max.d
@@ -1,3 +1,4 @@
+#source: ./max.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/min.d b/gas/testsuite/gas/rx/min.d
index 00cf0c0..ac4e179 100644
--- a/gas/testsuite/gas/rx/min.d
+++ b/gas/testsuite/gas/rx/min.d
@@ -1,3 +1,4 @@
+#source: ./min.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mov.d b/gas/testsuite/gas/rx/mov.d
index f170fc3..276b6d9 100644
--- a/gas/testsuite/gas/rx/mov.d
+++ b/gas/testsuite/gas/rx/mov.d
@@ -1,3 +1,4 @@
+#source: ./mov.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/movco.d b/gas/testsuite/gas/rx/movco.d
index 5c69374..0698359 100644
--- a/gas/testsuite/gas/rx/movco.d
+++ b/gas/testsuite/gas/rx/movco.d
@@ -1,3 +1,4 @@
+#source: ./movco.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/movli.d b/gas/testsuite/gas/rx/movli.d
index 4bacaa0..4ff268a 100644
--- a/gas/testsuite/gas/rx/movli.d
+++ b/gas/testsuite/gas/rx/movli.d
@@ -1,3 +1,4 @@
+#source: ./movli.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/movu.d b/gas/testsuite/gas/rx/movu.d
index 5a8689c..60f7fde 100644
--- a/gas/testsuite/gas/rx/movu.d
+++ b/gas/testsuite/gas/rx/movu.d
@@ -1,3 +1,4 @@
+#source: ./movu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/msbhi.d b/gas/testsuite/gas/rx/msbhi.d
index aad4c2f..9e916ac 100644
--- a/gas/testsuite/gas/rx/msbhi.d
+++ b/gas/testsuite/gas/rx/msbhi.d
@@ -1,3 +1,4 @@
+#source: ./msbhi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/msblh.d b/gas/testsuite/gas/rx/msblh.d
index dc9f449..7d4f1ef 100644
--- a/gas/testsuite/gas/rx/msblh.d
+++ b/gas/testsuite/gas/rx/msblh.d
@@ -1,3 +1,4 @@
+#source: ./msblh.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/msblo.d b/gas/testsuite/gas/rx/msblo.d
index 8e99f17..b24d108 100644
--- a/gas/testsuite/gas/rx/msblo.d
+++ b/gas/testsuite/gas/rx/msblo.d
@@ -1,3 +1,4 @@
+#source: ./msblo.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mul.d b/gas/testsuite/gas/rx/mul.d
index 65e4c06..ae0d835 100644
--- a/gas/testsuite/gas/rx/mul.d
+++ b/gas/testsuite/gas/rx/mul.d
@@ -1,3 +1,4 @@
+#source: ./mul.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mulhi.d b/gas/testsuite/gas/rx/mulhi.d
index 63c9837..ee4a517 100644
--- a/gas/testsuite/gas/rx/mulhi.d
+++ b/gas/testsuite/gas/rx/mulhi.d
@@ -1,3 +1,4 @@
+#source: ./mulhi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mullh.d b/gas/testsuite/gas/rx/mullh.d
index 36ff29d..1bce0fa 100644
--- a/gas/testsuite/gas/rx/mullh.d
+++ b/gas/testsuite/gas/rx/mullh.d
@@ -1,3 +1,4 @@
+#source: ./mullh.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mullo.d b/gas/testsuite/gas/rx/mullo.d
index 8cd01a1..aa8d63d 100644
--- a/gas/testsuite/gas/rx/mullo.d
+++ b/gas/testsuite/gas/rx/mullo.d
@@ -1,3 +1,4 @@
+#source: ./mullo.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfacgu.d b/gas/testsuite/gas/rx/mvfacgu.d
index 183a990..abfd4d9 100644
--- a/gas/testsuite/gas/rx/mvfacgu.d
+++ b/gas/testsuite/gas/rx/mvfacgu.d
@@ -1,3 +1,4 @@
+#source: ./mvfacgu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfachi.d b/gas/testsuite/gas/rx/mvfachi.d
index 164ec36..5846839 100644
--- a/gas/testsuite/gas/rx/mvfachi.d
+++ b/gas/testsuite/gas/rx/mvfachi.d
@@ -1,3 +1,4 @@
+#source: ./mvfachi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfaclo.d b/gas/testsuite/gas/rx/mvfaclo.d
index af6299d..450f243 100644
--- a/gas/testsuite/gas/rx/mvfaclo.d
+++ b/gas/testsuite/gas/rx/mvfaclo.d
@@ -1,3 +1,4 @@
+#source: ./mvfaclo.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfacmi.d b/gas/testsuite/gas/rx/mvfacmi.d
index 5ef4275..e4ed6ea 100644
--- a/gas/testsuite/gas/rx/mvfacmi.d
+++ b/gas/testsuite/gas/rx/mvfacmi.d
@@ -1,3 +1,4 @@
+#source: ./mvfacmi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfc.d b/gas/testsuite/gas/rx/mvfc.d
index 7e29b0f..bab1925 100644
--- a/gas/testsuite/gas/rx/mvfc.d
+++ b/gas/testsuite/gas/rx/mvfc.d
@@ -1,3 +1,4 @@
+#source: ./mvfc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfcp.d b/gas/testsuite/gas/rx/mvfcp.d
index f7b3a41..c7de7be 100644
--- a/gas/testsuite/gas/rx/mvfcp.d
+++ b/gas/testsuite/gas/rx/mvfcp.d
@@ -1,3 +1,4 @@
+#source: ./mvfcp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfdc.d b/gas/testsuite/gas/rx/mvfdc.d
index c36617a..69de739 100644
--- a/gas/testsuite/gas/rx/mvfdc.d
+++ b/gas/testsuite/gas/rx/mvfdc.d
@@ -1,3 +1,4 @@
+#source: ./mvfdc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvfdr.d b/gas/testsuite/gas/rx/mvfdr.d
index 52190a5..3f9216b 100644
--- a/gas/testsuite/gas/rx/mvfdr.d
+++ b/gas/testsuite/gas/rx/mvfdr.d
@@ -1,3 +1,4 @@
+#source: ./mvfdr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtacgu.d b/gas/testsuite/gas/rx/mvtacgu.d
index 8cc9a74..334cafa 100644
--- a/gas/testsuite/gas/rx/mvtacgu.d
+++ b/gas/testsuite/gas/rx/mvtacgu.d
@@ -1,3 +1,4 @@
+#source: ./mvtacgu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtachi.d b/gas/testsuite/gas/rx/mvtachi.d
index ee54ec7..1fd876c 100644
--- a/gas/testsuite/gas/rx/mvtachi.d
+++ b/gas/testsuite/gas/rx/mvtachi.d
@@ -1,3 +1,4 @@
+#source: ./mvtachi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtaclo.d b/gas/testsuite/gas/rx/mvtaclo.d
index d62c65f..77d3dae 100644
--- a/gas/testsuite/gas/rx/mvtaclo.d
+++ b/gas/testsuite/gas/rx/mvtaclo.d
@@ -1,3 +1,4 @@
+#source: ./mvtaclo.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtc.d b/gas/testsuite/gas/rx/mvtc.d
index 4c3a87a..f5a4ce9 100644
--- a/gas/testsuite/gas/rx/mvtc.d
+++ b/gas/testsuite/gas/rx/mvtc.d
@@ -1,3 +1,4 @@
+#source: ./mvtc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtcp.d b/gas/testsuite/gas/rx/mvtcp.d
index f7b3a41..88066bd 100644
--- a/gas/testsuite/gas/rx/mvtcp.d
+++ b/gas/testsuite/gas/rx/mvtcp.d
@@ -1,3 +1,4 @@
+#source: ./mvtcp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/mvtdc.d b/gas/testsuite/gas/rx/mvtdc.d
index 2b61156..b353df1 100644
--- a/gas/testsuite/gas/rx/mvtdc.d
+++ b/gas/testsuite/gas/rx/mvtdc.d
@@ -1,3 +1,4 @@
+#source: ./mvtdc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/neg.d b/gas/testsuite/gas/rx/neg.d
index 8e3cc7f..88e367e 100644
--- a/gas/testsuite/gas/rx/neg.d
+++ b/gas/testsuite/gas/rx/neg.d
@@ -1,3 +1,4 @@
+#source: ./neg.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/nop.d b/gas/testsuite/gas/rx/nop.d
index 4d1be9c..9a44be51 100644
--- a/gas/testsuite/gas/rx/nop.d
+++ b/gas/testsuite/gas/rx/nop.d
@@ -1,3 +1,4 @@
+#source: ./nop.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/not.d b/gas/testsuite/gas/rx/not.d
index 4fe735c..d736155 100644
--- a/gas/testsuite/gas/rx/not.d
+++ b/gas/testsuite/gas/rx/not.d
@@ -1,3 +1,4 @@
+#source: ./not.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/opecp.d b/gas/testsuite/gas/rx/opecp.d
index f7b3a41..315e252 100644
--- a/gas/testsuite/gas/rx/opecp.d
+++ b/gas/testsuite/gas/rx/opecp.d
@@ -1,3 +1,4 @@
+#source: ./opecp.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/or.d b/gas/testsuite/gas/rx/or.d
index 3ede4d6..bb472d5 100644
--- a/gas/testsuite/gas/rx/or.d
+++ b/gas/testsuite/gas/rx/or.d
@@ -1,3 +1,4 @@
+#source: ./or.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/pop.d b/gas/testsuite/gas/rx/pop.d
index 42489ea..248d5e3 100644
--- a/gas/testsuite/gas/rx/pop.d
+++ b/gas/testsuite/gas/rx/pop.d
@@ -1,3 +1,4 @@
+#source: ./pop.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/popc.d b/gas/testsuite/gas/rx/popc.d
index 8687af9..e83116a 100644
--- a/gas/testsuite/gas/rx/popc.d
+++ b/gas/testsuite/gas/rx/popc.d
@@ -1,3 +1,4 @@
+#source: ./popc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/popm.d b/gas/testsuite/gas/rx/popm.d
index a086f2b..23dae78 100644
--- a/gas/testsuite/gas/rx/popm.d
+++ b/gas/testsuite/gas/rx/popm.d
@@ -1,3 +1,4 @@
+#source: ./popm.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/push.d b/gas/testsuite/gas/rx/push.d
index bce26a7..9ec4039 100644
--- a/gas/testsuite/gas/rx/push.d
+++ b/gas/testsuite/gas/rx/push.d
@@ -1,3 +1,4 @@
+#source: ./push.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/pushc.d b/gas/testsuite/gas/rx/pushc.d
index 945f795..1660313 100644
--- a/gas/testsuite/gas/rx/pushc.d
+++ b/gas/testsuite/gas/rx/pushc.d
@@ -1,3 +1,4 @@
+#source: ./pushc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/pushm.d b/gas/testsuite/gas/rx/pushm.d
index 7b58b15..21660b7 100644
--- a/gas/testsuite/gas/rx/pushm.d
+++ b/gas/testsuite/gas/rx/pushm.d
@@ -1,3 +1,4 @@
+#source: ./pushm.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/r-bcc.d b/gas/testsuite/gas/rx/r-bcc.d
index 18cc15c..799e7ea 100644
--- a/gas/testsuite/gas/rx/r-bcc.d
+++ b/gas/testsuite/gas/rx/r-bcc.d
@@ -1,3 +1,4 @@
+#source: ./r-bcc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/r-bra.d b/gas/testsuite/gas/rx/r-bra.d
index a27b42c..9b92b46 100644
--- a/gas/testsuite/gas/rx/r-bra.d
+++ b/gas/testsuite/gas/rx/r-bra.d
@@ -1,3 +1,4 @@
+#source: ./r-bra.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/racl.d b/gas/testsuite/gas/rx/racl.d
index 72b145b..a9c167b 100644
--- a/gas/testsuite/gas/rx/racl.d
+++ b/gas/testsuite/gas/rx/racl.d
@@ -1,3 +1,4 @@
+#source: ./racl.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/racw.d b/gas/testsuite/gas/rx/racw.d
index f29ddfe..fe46d2d 100644
--- a/gas/testsuite/gas/rx/racw.d
+++ b/gas/testsuite/gas/rx/racw.d
@@ -1,3 +1,4 @@
+#source: ./racw.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rdacl.d b/gas/testsuite/gas/rx/rdacl.d
index d9e418b..cc57d42 100644
--- a/gas/testsuite/gas/rx/rdacl.d
+++ b/gas/testsuite/gas/rx/rdacl.d
@@ -1,3 +1,4 @@
+#source: ./rdacl.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rdacw.d b/gas/testsuite/gas/rx/rdacw.d
index 81a4eae..26947c0 100644
--- a/gas/testsuite/gas/rx/rdacw.d
+++ b/gas/testsuite/gas/rx/rdacw.d
@@ -1,3 +1,4 @@
+#source: ./rdacw.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/revl.d b/gas/testsuite/gas/rx/revl.d
index e5c976a..6a4e8cf 100644
--- a/gas/testsuite/gas/rx/revl.d
+++ b/gas/testsuite/gas/rx/revl.d
@@ -1,3 +1,4 @@
+#source: ./revl.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/revw.d b/gas/testsuite/gas/rx/revw.d
index c3965ce..e006702 100644
--- a/gas/testsuite/gas/rx/revw.d
+++ b/gas/testsuite/gas/rx/revw.d
@@ -1,3 +1,4 @@
+#source: ./revw.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rmpa.d b/gas/testsuite/gas/rx/rmpa.d
index ae6e173..440f941 100644
--- a/gas/testsuite/gas/rx/rmpa.d
+++ b/gas/testsuite/gas/rx/rmpa.d
@@ -1,3 +1,4 @@
+#source: ./rmpa.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rolc.d b/gas/testsuite/gas/rx/rolc.d
index 9cff76f..505055d 100644
--- a/gas/testsuite/gas/rx/rolc.d
+++ b/gas/testsuite/gas/rx/rolc.d
@@ -1,3 +1,4 @@
+#source: ./rolc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rorc.d b/gas/testsuite/gas/rx/rorc.d
index 2dde847..8d6c320 100644
--- a/gas/testsuite/gas/rx/rorc.d
+++ b/gas/testsuite/gas/rx/rorc.d
@@ -1,3 +1,4 @@
+#source: ./rorc.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rotl.d b/gas/testsuite/gas/rx/rotl.d
index e2d3653..60bc5dd 100644
--- a/gas/testsuite/gas/rx/rotl.d
+++ b/gas/testsuite/gas/rx/rotl.d
@@ -1,3 +1,4 @@
+#source: ./rotl.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rotr.d b/gas/testsuite/gas/rx/rotr.d
index e020905..204ad4c 100644
--- a/gas/testsuite/gas/rx/rotr.d
+++ b/gas/testsuite/gas/rx/rotr.d
@@ -1,3 +1,4 @@
+#source: ./rotr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/round.d b/gas/testsuite/gas/rx/round.d
index dff8b43..042c0c9 100644
--- a/gas/testsuite/gas/rx/round.d
+++ b/gas/testsuite/gas/rx/round.d
@@ -1,3 +1,4 @@
+#source: ./round.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rstr.d b/gas/testsuite/gas/rx/rstr.d
index e72aef7..808340f 100644
--- a/gas/testsuite/gas/rx/rstr.d
+++ b/gas/testsuite/gas/rx/rstr.d
@@ -1,3 +1,4 @@
+#source: ./rstr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rte.d b/gas/testsuite/gas/rx/rte.d
index 243a73e..37eb4c4 100644
--- a/gas/testsuite/gas/rx/rte.d
+++ b/gas/testsuite/gas/rx/rte.d
@@ -1,3 +1,4 @@
+#source: ./rte.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rtfi.d b/gas/testsuite/gas/rx/rtfi.d
index 9c40396..a1dc111 100644
--- a/gas/testsuite/gas/rx/rtfi.d
+++ b/gas/testsuite/gas/rx/rtfi.d
@@ -1,3 +1,4 @@
+#source: ./rtfi.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rts.d b/gas/testsuite/gas/rx/rts.d
index 4d76926..bd4ad07 100644
--- a/gas/testsuite/gas/rx/rts.d
+++ b/gas/testsuite/gas/rx/rts.d
@@ -1,3 +1,4 @@
+#source: ./rts.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rtsd.d b/gas/testsuite/gas/rx/rtsd.d
index 957c4e0..c9f4cc1 100644
--- a/gas/testsuite/gas/rx/rtsd.d
+++ b/gas/testsuite/gas/rx/rtsd.d
@@ -1,3 +1,4 @@
+#source: ./rtsd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/rx.exp b/gas/testsuite/gas/rx/rx.exp
index 61437b8..8d2c4b21 100644
--- a/gas/testsuite/gas/rx/rx.exp
+++ b/gas/testsuite/gas/rx/rx.exp
@@ -26,10 +26,10 @@ set ASFLAGS "--mcpu=rxv3-dfpu"
 
 foreach test [lsort [glob $srcdir/$subdir/*.sm]] {
     regexp ".*/(.*)\.sm" $test rxjunk rxbase
-    exec "$srcdir/$subdir/explode" "-I" "$srcdir/$subdir" "$test" "$srcdir/$subdir/$rxbase.s"
+    exec "$srcdir/$subdir/explode" "-I" "$srcdir/$subdir" "$test" "$rxbase.s"
     run_dump_test "$rxbase"
     # Commment out the next line if you want to retain the generated assembler source files.
-#    remote_file host delete "$srcdir/$subdir/$rxbase.s"
+    remote_file host delete "$rxbase.s"
 }
 
 run_dump_test "rx-asm-good"
diff --git a/gas/testsuite/gas/rx/sat.d b/gas/testsuite/gas/rx/sat.d
index b708f93..97d5b4f 100644
--- a/gas/testsuite/gas/rx/sat.d
+++ b/gas/testsuite/gas/rx/sat.d
@@ -1,3 +1,4 @@
+#source: ./sat.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/satr.d b/gas/testsuite/gas/rx/satr.d
index c977055..9ba914b 100644
--- a/gas/testsuite/gas/rx/satr.d
+++ b/gas/testsuite/gas/rx/satr.d
@@ -1,3 +1,4 @@
+#source: ./satr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/save.d b/gas/testsuite/gas/rx/save.d
index 16a637c..90f8f0f 100644
--- a/gas/testsuite/gas/rx/save.d
+++ b/gas/testsuite/gas/rx/save.d
@@ -1,3 +1,4 @@
+#source: ./save.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/sbb.d b/gas/testsuite/gas/rx/sbb.d
index df31597..24e19c3 100644
--- a/gas/testsuite/gas/rx/sbb.d
+++ b/gas/testsuite/gas/rx/sbb.d
@@ -1,3 +1,4 @@
+#source: ./sbb.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/sccnd.d b/gas/testsuite/gas/rx/sccnd.d
index 229a334..61de5d8 100644
--- a/gas/testsuite/gas/rx/sccnd.d
+++ b/gas/testsuite/gas/rx/sccnd.d
@@ -1,3 +1,4 @@
+#source: ./sccnd.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/scmpu.d b/gas/testsuite/gas/rx/scmpu.d
index 3ac3003..1086fd1 100644
--- a/gas/testsuite/gas/rx/scmpu.d
+++ b/gas/testsuite/gas/rx/scmpu.d
@@ -1,3 +1,4 @@
+#source: ./scmpu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/setpsw.d b/gas/testsuite/gas/rx/setpsw.d
index 0eb55c1..c2fc147 100644
--- a/gas/testsuite/gas/rx/setpsw.d
+++ b/gas/testsuite/gas/rx/setpsw.d
@@ -1,3 +1,4 @@
+#source: ./setpsw.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/shar.d b/gas/testsuite/gas/rx/shar.d
index bb925cb..62b61a5 100644
--- a/gas/testsuite/gas/rx/shar.d
+++ b/gas/testsuite/gas/rx/shar.d
@@ -1,3 +1,4 @@
+#source: ./shar.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/shll.d b/gas/testsuite/gas/rx/shll.d
index 296bdce..c808e72 100644
--- a/gas/testsuite/gas/rx/shll.d
+++ b/gas/testsuite/gas/rx/shll.d
@@ -1,3 +1,4 @@
+#source: ./shll.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/shlr.d b/gas/testsuite/gas/rx/shlr.d
index 6c2cbff..070db1d 100644
--- a/gas/testsuite/gas/rx/shlr.d
+++ b/gas/testsuite/gas/rx/shlr.d
@@ -1,3 +1,4 @@
+#source: ./shlr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/smovb.d b/gas/testsuite/gas/rx/smovb.d
index a9a49cf..6c362fc 100644
--- a/gas/testsuite/gas/rx/smovb.d
+++ b/gas/testsuite/gas/rx/smovb.d
@@ -1,3 +1,4 @@
+#source: ./smovb.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/smovf.d b/gas/testsuite/gas/rx/smovf.d
index 2f2a2a3..a54f534 100644
--- a/gas/testsuite/gas/rx/smovf.d
+++ b/gas/testsuite/gas/rx/smovf.d
@@ -1,3 +1,4 @@
+#source: ./smovf.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/smovu.d b/gas/testsuite/gas/rx/smovu.d
index 1b4a3de..41f867b 100644
--- a/gas/testsuite/gas/rx/smovu.d
+++ b/gas/testsuite/gas/rx/smovu.d
@@ -1,3 +1,4 @@
+#source: ./smovu.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/sstr.d b/gas/testsuite/gas/rx/sstr.d
index 7256dd4..2838bd0 100644
--- a/gas/testsuite/gas/rx/sstr.d
+++ b/gas/testsuite/gas/rx/sstr.d
@@ -1,3 +1,4 @@
+#source: ./sstr.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/stnz.d b/gas/testsuite/gas/rx/stnz.d
index adbfc55..5fd607e 100644
--- a/gas/testsuite/gas/rx/stnz.d
+++ b/gas/testsuite/gas/rx/stnz.d
@@ -1,3 +1,4 @@
+#source: ./stnz.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/stz.d b/gas/testsuite/gas/rx/stz.d
index ad6189d..bb84ace 100644
--- a/gas/testsuite/gas/rx/stz.d
+++ b/gas/testsuite/gas/rx/stz.d
@@ -1,3 +1,4 @@
+#source: ./stz.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/sub.d b/gas/testsuite/gas/rx/sub.d
index 5356294..de2408c 100644
--- a/gas/testsuite/gas/rx/sub.d
+++ b/gas/testsuite/gas/rx/sub.d
@@ -1,3 +1,4 @@
+#source: ./sub.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/suntil.d b/gas/testsuite/gas/rx/suntil.d
index 086392f..4e9bb1a 100644
--- a/gas/testsuite/gas/rx/suntil.d
+++ b/gas/testsuite/gas/rx/suntil.d
@@ -1,3 +1,4 @@
+#source: ./suntil.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/swhile.d b/gas/testsuite/gas/rx/swhile.d
index db97059..9e7c746 100644
--- a/gas/testsuite/gas/rx/swhile.d
+++ b/gas/testsuite/gas/rx/swhile.d
@@ -1,3 +1,4 @@
+#source: ./swhile.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/tst.d b/gas/testsuite/gas/rx/tst.d
index 4e55420..11c1d31 100644
--- a/gas/testsuite/gas/rx/tst.d
+++ b/gas/testsuite/gas/rx/tst.d
@@ -1,3 +1,4 @@
+#source: ./tst.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/utof.d b/gas/testsuite/gas/rx/utof.d
index 19ceb32..ae5238a 100644
--- a/gas/testsuite/gas/rx/utof.d
+++ b/gas/testsuite/gas/rx/utof.d
@@ -1,3 +1,4 @@
+#source: ./utof.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/wait.d b/gas/testsuite/gas/rx/wait.d
index 8af3e78..e6ac5ab 100644
--- a/gas/testsuite/gas/rx/wait.d
+++ b/gas/testsuite/gas/rx/wait.d
@@ -1,3 +1,4 @@
+#source: ./wait.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/xchg.d b/gas/testsuite/gas/rx/xchg.d
index 7d68ffc..776c840 100644
--- a/gas/testsuite/gas/rx/xchg.d
+++ b/gas/testsuite/gas/rx/xchg.d
@@ -1,3 +1,4 @@
+#source: ./xchg.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/gas/testsuite/gas/rx/xor.d b/gas/testsuite/gas/rx/xor.d
index 11b134e..fccf11c 100644
--- a/gas/testsuite/gas/rx/xor.d
+++ b/gas/testsuite/gas/rx/xor.d
@@ -1,3 +1,4 @@
+#source: ./xor.s
 #objdump: -dr
 
 .*:     file format .*
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3fc4606..fa35cbf 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-08  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-elf/sec64k.exp: Use . rather than $objdir in
+	generated source file names.
+	* testsuite/ld-m68k/m68k-got.exp: Likewise.
+
 2019-01-01  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
index 07483ea..783d9ee 100644
--- a/ld/testsuite/ld-elf/sec64k.exp
+++ b/ld/testsuite/ld-elf/sec64k.exp
@@ -61,7 +61,7 @@ set sfiles {}
 set max_sec 66000
 set secs_per_file 1000
 for { set i 0 } { $i < $max_sec / $secs_per_file } { incr i } {
-    set sfile "$objdir/tmpdir/sec64-$i.s"
+    set sfile "./tmpdir/sec64-$i.s"
     lappend sfiles $sfile
     if [catch { set ofd [open $sfile w] } x] {
 	perror "$x"
diff --git a/ld/testsuite/ld-m68k/m68k-got.exp b/ld/testsuite/ld-m68k/m68k-got.exp
index f2205d6..bbe0397 100644
--- a/ld/testsuite/ld-m68k/m68k-got.exp
+++ b/ld/testsuite/ld-m68k/m68k-got.exp
@@ -155,62 +155,62 @@ proc got_test { testname } {
 
     switch --  $testname {
 	"got-single-12-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
+	    puts $ofd "#source: ./tmpdir/got-12.s"
 	    set count 8189
 	}
 	"got-single-13-er" {
-	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
+	    puts $ofd "#source: ./tmpdir/got-13.s"
 	    set count 0
 	}
 	"got-negative-14-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
 	    set count 16382
 	}
 	"got-negative-15-er" {
-	    puts $ofd "#source: $objdir/tmpdir/got-15.s"
+	    puts $ofd "#source: ./tmpdir/got-15.s"
 	    set count 0
 	}
 	"got-negative-12-13-14-34-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-34.s"
+	    puts $ofd "#source: ./tmpdir/got-12.s"
+	    puts $ofd "#source: ./tmpdir/got-13.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/got-34.s"
 	    set count 16382
 	}
 	"got-negative-12-13-14-35-er" {
-	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-35.s"
+	    puts $ofd "#source: ./tmpdir/got-12.s"
+	    puts $ofd "#source: ./tmpdir/got-13.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/got-35.s"
 	    set count 0
 	}
 	"got-multigot-14-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
 	    set count 16382
 	}
 	"got-multigot-15-er" {
-	    puts $ofd "#source: $objdir/tmpdir/got-15.s"
+	    puts $ofd "#source: ./tmpdir/got-15.s"
 	    set count 0
 	}
 	"got-multigot-12-13-14-34-35-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-34.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-35.s"
+	    puts $ofd "#source: ./tmpdir/got-12.s"
+	    puts $ofd "#source: ./tmpdir/got-13.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/got-34.s"
+	    puts $ofd "#source: ./tmpdir/got-35.s"
 	    set count 24578
 	}
 	"got-xgot-15-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/xgot-15.s"
+	    puts $ofd "#source: ./tmpdir/xgot-15.s"
 	    set count 16385
 	}
 	"got-xgot-12-13-14-15-34-35-ok" {
-	    puts $ofd "#source: $objdir/tmpdir/got-12.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-13.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-14.s"
-	    puts $ofd "#source: $objdir/tmpdir/xgot-15.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-34.s"
-	    puts $ofd "#source: $objdir/tmpdir/got-35.s"
+	    puts $ofd "#source: ./tmpdir/got-12.s"
+	    puts $ofd "#source: ./tmpdir/got-13.s"
+	    puts $ofd "#source: ./tmpdir/got-14.s"
+	    puts $ofd "#source: ./tmpdir/xgot-15.s"
+	    puts $ofd "#source: ./tmpdir/got-34.s"
+	    puts $ofd "#source: ./tmpdir/got-35.s"
 	    set count 24581
 	}
     }



More information about the Binutils-cvs mailing list