binutils/testsuite: Support REL and MIPS64 reloc formats with `strip-13'

Add source variants for the `strip-13' test that produce relocations in
the REL and MIPS64 formats, fixing a failure for the `mips64el-openbsd'
target.  This also corrects output for `i*86-*', `i960-*', `m6812-*' and
`m68hc12-*', o32 `mips*-*', and `score*-*' targets, which however does
not show up as a test result change due to lax error message matching
causing `bad value' previously produced by `strip' as a result of input
file rejection to be accepted as a test pass.

For `m6811-*' aka `m68hc11-*' targets this causes a phantom regression,
because they use 16-bit addressing and therefore `.dc.a' emits 16-bit
quantities causing relocation data constructed in assembly not to be as
expected.  Previously input was rejected by `strip' with a `bad value'
message and now it is accepted, however due to the relocation data error
the relocation number is not one of the unsupported ones and the tool
completes successfully, which scores as a test failure.

Disable the test case for `m6811-*' and `m68hc11-*' targets then, as it
is a test case bug rather than a problem with the relevant backend.  A
separate change to the test case is required to correct this problem, at
which point the test case can be enabled for the affected targets.

	binutils/
	* testsuite/binutils-all/strip-13.s: Rename to...
	* testsuite/binutils-all/strip-13rela.s: ... this.
	* testsuite/binutils-all/strip-13rel.s: New test source.
	* testsuite/binutils-all/strip-13mips64.s: New test source.
	* testsuite/binutils-all/strip-13.d: Remove `arm-*', `d10v-*',
	`dlx-*' and `xgate-*' from `not-target' list.  Add `m6811-*' and
	`m68hc11-*' to `not-target' list.
	* testsuite/binutils-all/objcopy.exp: Switch between sources for
	`strip-13'.

6 files changed, 64 insertions, 5 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 23598a0..8ca9db4 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,17 @@
 2018-04-05  Maciej W. Rozycki  <macro@mips.com>
 
+	* testsuite/binutils-all/strip-13.s: Rename to...
+	* testsuite/binutils-all/strip-13rela.s: ... this.
+	* testsuite/binutils-all/strip-13rel.s: New test source.
+	* testsuite/binutils-all/strip-13mips64.s: New test source.
+	* testsuite/binutils-all/strip-13.d: Remove `arm-*', `d10v-*',
+	`dlx-*' and `xgate-*' from `not-target' list.  Add `m6811-*' and
+	`m68hc11-*' to `not-target' list.
+	* testsuite/binutils-all/objcopy.exp: Switch between sources for
+	`strip-13'.
+
+2018-04-05  Maciej W. Rozycki  <macro@mips.com>
+
 	* testsuite/binutils-all/strip-13.s: Use 143 (0x8f) rather than
 	241 (0xf1) for the relocation number and RELA addend.
 	* testsuite/binutils-all/strip-13.d: Remove `hppa*-*' from the
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index f7b811c..0639fe5 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1084,7 +1084,29 @@ if [is_elf_format] {
     run_dump_test "strip-8"
     run_dump_test "strip-9"
     run_dump_test "strip-12"
-    run_dump_test "strip-13"
+
+    if { [istarget "mips64*-*-openbsd*"] } {
+	set reloc_format mips64
+    } elseif { [istarget "arm-*"] \
+	       || [istarget "d10v-*"] \
+	       || [istarget "dlx-*"] \
+	       || [istarget "i*86-*"] \
+	       || [istarget "i960-*"] \
+	       || [istarget "m681*-*"] \
+	       || [istarget "m68hc1*-*"] \
+	       || ([istarget "mips*-*"] \
+		   && ![istarget "mips64*-ps2-elf*"] \
+		   && ![istarget "*-*-irix6*"] \
+		   && ![istarget "mips64*-*-freebsd*"] \
+		   && ![istarget "mips64*-*-kfreebsd*-gnu"] \
+		   && ![istarget "mips64*-*-linux*"]) \
+	       || [istarget "score*-*"] \
+	       || [istarget "xgate-*"] } {
+	set reloc_format rel
+    } else {
+	set reloc_format rela
+    }
+    run_dump_test "strip-13" [list [list source strip-13${reloc_format}.s]]
 
     # This requires STB_GNU_UNIQUE support with OSABI set to GNU.
     if { [supports_gnu_unique] } {
diff --git a/binutils/testsuite/binutils-all/strip-13.d b/binutils/testsuite/binutils-all/strip-13.d
index 48549c7..5069b2c 100644
--- a/binutils/testsuite/binutils-all/strip-13.d
+++ b/binutils/testsuite/binutils-all/strip-13.d
@@ -1,8 +1,9 @@
 #PROG: strip
 #strip: -g
 #error: .* bad value
-#not-target: arm-* d10v-* dlx-* h8300-* ip2k-* rx-* xgate-*
-# The D10V, DLX and XGATE targets only support REL relocations but this test uses RELA relocations.
-# The ARM target does support both types, but defaults to REL.
-# The H8300-*, IP2K and RX targets do not complain about unrecognised relocs, unless they are actually used
+#not-target: h8300-* ip2k-* m6811-* m68hc11-* rx-*
+# The H8300-*, IP2K and 68HC11 targets use 16-bit addressing, so `.dc.a'
+#  does not work for manual relocation data construction.
+# The RX targets do not complain about unrecognised relocs, unless they
+#  are actually used
 #  (which is what should really happen with the other targets...)
diff --git a/binutils/testsuite/binutils-all/strip-13mips64.s b/binutils/testsuite/binutils-all/strip-13mips64.s
new file mode 100644
index 0000000..36323e0
--- /dev/null
+++ b/binutils/testsuite/binutils-all/strip-13mips64.s
@@ -0,0 +1,14 @@
+	.text
+foo:
+	.dc.l    0x12345678
+
+	.section .rela.text
+	.dc.a	 0
+	.dc.l    0
+	.dc.b    0, 0, 0, 0x8f
+	.dc.a	 0x0000008f
+
+	.dc.a	 0
+	.dc.w    0
+	.dc.b    0, 0, 0, 0
+	.dc.a	 0
diff --git a/binutils/testsuite/binutils-all/strip-13rel.s b/binutils/testsuite/binutils-all/strip-13rel.s
new file mode 100644
index 0000000..de7eae1
--- /dev/null
+++ b/binutils/testsuite/binutils-all/strip-13rel.s
@@ -0,0 +1,10 @@
+	.text
+foo:
+	.dc.l    0x12345678
+
+	.section .rel.text
+	.dc.a	 0
+	.dc.a    0x0000008f
+
+	.dc.a	 0
+	.dc.a    0
diff --git a/binutils/testsuite/binutils-all/strip-13.s b/binutils/testsuite/binutils-all/strip-13rela.s
index 886c0ee..886c0ee 100644
--- a/binutils/testsuite/binutils-all/strip-13.s
+++ b/binutils/testsuite/binutils-all/strip-13rela.s