From 171b8e19575654ab32321eb99f3fd112663ae7fa Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 8 Jan 2019 16:47:52 +1030
Subject: [PATCH] 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.
---
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 d7f1685e3d8..d64f5101892 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 afe21fa7585..213e53f1f53 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 604ff423264..6deda0adb7e 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 8bf444bc89c..6944bde3478 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 d690b00ff7b..f94b2aefa4a 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 63fe4b76606..4e7ae95c0cb 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 d2482f596af..54fbe8262ab 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 ed44614be26..11c0310d5f3 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 fb2033f9dea..94905a6ea63 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 72b15c2b71d..d88ed69cb74 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 9d61ff87189..023f043b73c 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 2c1df453704..ce9edb641f0 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 1e4c7744832..35b7ec56299 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 710fa768959..ee14bb4d8d4 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 cbe0892a4f9..e2f0c656a30 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 818dc0b237d..8699b2faeac 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 ee6ab15801d..860ca7b8e8a 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 3f1459f1bab..898d32333bd 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 20678b517b9..c8580aa971d 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 c1317f4a0b0..0bc3f6eb9db 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 48762d81e3e..730f53d2b30 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 8f948fe3398..1db08291f79 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 d3dbd61a475..c104801be2a 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 bf7bc06cbd9..93d9c4e0c47 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 f40dc5b0134..589a0436f46 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 0d7f5b0011f..dcaaa3d19f2 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 4b0641547a7..d0fd9e192c2 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 2e5ecdb4197..75fd0e0e695 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 4247635d702..4f515c07ae7 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 9511e797991..df1a7909f26 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 34e691790e8..2744124fda6 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 d5a51d082c2..c5b39ed8245 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 e88d39e2c00..63c8bf54b3b 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 91a769c9997..e3ea79d6d96 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 939850e19fc..6a126d29a21 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 8d7c5eae267..da07780ff65 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 05edcc0b6a2..c2381a63caf 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 a5fdc100368..771616bd17c 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 c7f27514b2d..32d21d232e0 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 82fd3f561ef..bddc26dba29 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 aecc53a6aed..33b1ce340dc 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 a7f9e029245..d862423650e 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 4e0743c5628..2749db45997 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 a87103ee433..9047e508441 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 fab094ffdaf..5ff57ee00fc 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 6005f3f34f1..f176fed539d 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 797f0188a43..e92432a57d4 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 348f1f0f8c0..bad9a63ae5e 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 6bc2d33f553..b0aac8950f5 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 1de0d7d249e..ce5d81f9a97 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 3b09b449ca6..00776cbb40d 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 901484c3a70..242eebd4f06 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 cfaeb1f2cea..1f98d8a1e63 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 20b81d89f66..160e6eccc27 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 384955a12f4..3c5a29b9162 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 2b7aece6c47..1cb1b158d86 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 9bf90511439..64863df7d60 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 7f20650f5d3..3d8c1160c76 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 00cf0c0921a..ac4e1791544 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 f170fc37057..276b6d9d898 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 5c69374104a..0698359a7f3 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 4bacaa00ca9..4ff268af022 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 5a8689c4af6..60f7fdeec98 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 aad4c2f7292..9e916ac1010 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 dc9f4491f17..7d4f1ef905f 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 8e99f176358..b24d10804e3 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 65e4c06d340..ae0d8358b10 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 63c9837f56b..ee4a5179137 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 36ff29de54a..1bce0fa3a8d 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 8cd01a155e4..aa8d63de35c 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 183a990842b..abfd4d99333 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 164ec361a9e..58468392830 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 af6299d1544..450f243e20e 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 5ef42756834..e4ed6ea8f76 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 7e29b0ffb02..bab19253216 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 f7b3a41783b..c7de7befb6a 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 c36617a97d5..69de7393e4c 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 52190a5728f..3f9216b9685 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 8cc9a74089b..334cafa902e 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 ee54ec7a92b..1fd876c792b 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 d62c65fdecc..77d3dae9633 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 4c3a87ae686..f5a4ce90213 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 f7b3a41783b..88066bd9fa4 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 2b611569102..b353df172a5 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 8e3cc7fdafa..88e367ef827 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 4d1be9caa35..9a44be51631 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 4fe735c44ce..d7361559b30 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 f7b3a41783b..315e2527679 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 3ede4d6ba0b..bb472d5ec98 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 42489ea8612..248d5e36619 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 8687af976ee..e83116aef35 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 a086f2bde13..23dae7800dd 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 bce26a7d909..9ec40395c83 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 945f7957c18..16603135875 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 7b58b1550bb..21660b772a1 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 18cc15c4eac..799e7ea8ae9 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 a27b42c911f..9b92b46968f 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 72b145b8424..a9c167bc297 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 f29ddfeb173..fe46d2dc21e 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 d9e418b88e1..cc57d42d3c9 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 81a4eaea7a3..26947c01290 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 e5c976aaba5..6a4e8cf6b1d 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 c3965ced48b..e00670218ab 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 ae6e173aa2e..440f941ea1d 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 9cff76fb180..505055d37ef 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 2dde847f58c..8d6c32085f6 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 e2d3653f6cf..60bc5ddd342 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 e0209052bd6..204ad4c4811 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 dff8b43e249..042c0c990bb 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 e72aef786b9..808340f4e55 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 243a73e0e09..37eb4c43d68 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 9c40396bea4..a1dc1112bbb 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 4d769261449..bd4ad07c3d4 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 957c4e0f482..c9f4cc1cac9 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 61437b865c8..8d2c4b21aff 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 b708f9342fe..97d5b4f61b5 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 c9770555ac8..9ba914b4afa 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 16a637c5178..90f8f0ff8a3 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 df31597f0c6..24e19c37dcb 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 229a33473d0..61de5d840d5 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 3ac300313fa..1086fd17e09 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 0eb55c1d75f..c2fc147b07c 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 bb925cbc77a..62b61a5aa25 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 296bdcea189..c808e72b1d4 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 6c2cbff0797..070db1d2351 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 a9a49cf9591..6c362fcfddc 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 2f2a2a3ffc2..a54f5347ccf 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 1b4a3de7207..41f867bb454 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 7256dd48174..2838bd0b849 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 adbfc557ca9..5fd607e9690 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 ad6189d32df..bb84ace31ba 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 5356294bc8d..de2408cc95e 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 086392fd2a8..4e9bb1ab9f2 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 db97059a634..9e7c746d53d 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 4e554200d98..11c1d3186ba 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 19ceb326961..ae5238a6a28 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 8af3e78a923..e6ac5ab6966 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 7d68ffc8db0..776c84069f0 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 11b134ef849..fccf11c953c 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 3fc4606d0a6..fa35cbfb529 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 07483ea1894..783d9ee017d 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 f2205d60b54..bbe0397a39f 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
}
}