From d4ae1932770d9ec76f3d0a429aab45f1cb15e964 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 10 Apr 2018 09:14:29 +0930 Subject: [PATCH] Fix some strip test fails on nds32 and pru Fixes these fails: nds32le-linux +FAIL: binutils-all/strip-14 nds32le-linux +FAIL: binutils-all/strip-15 pru-elf +FAIL: binutils-all/strip-14 pru-elf +FAIL: binutils-all/strip-15 strip-13 fails on nds32 due to an assertion failure and out of bounds access to nds32_elf_howto_table. * testsuite/binutils-all/objcopy.exp (strip-14, strip-15): Choose reloc=11 for pru and reloc=50 for nds32. * testsuite/binutils-all/strip-15.d: Accept 0xb reloc number. --- binutils/ChangeLog | 6 ++++++ binutils/testsuite/binutils-all/objcopy.exp | 3 +++ binutils/testsuite/binutils-all/strip-15.d | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c7a631aa82..07356e2501 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2018-04-10 Alan Modra + + * testsuite/binutils-all/objcopy.exp (strip-14, strip-15): Choose + reloc=11 for pru and reloc=50 for nds32. + * testsuite/binutils-all/strip-15.d: Accept 0xb reloc number. + 2018-04-09 Maciej W. Rozycki * testsuite/binutils-all/strip-15.d: New test. diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index 366a4a34f8..b308fd7e37 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -1113,8 +1113,11 @@ if [is_elf_format] { set reloc 259 } elseif { [istarget "ia64*-*"] \ || [istarget "m32r*-*"] \ + || [istarget "nds32*-*"] \ || [istarget "v850*-*"] } { set reloc 50 + } elseif { [istarget "pru-*"] } { + set reloc 11 } else { set reloc 1 } diff --git a/binutils/testsuite/binutils-all/strip-15.d b/binutils/testsuite/binutils-all/strip-15.d index 03d7d1a78d..f649287cf5 100644 --- a/binutils/testsuite/binutils-all/strip-15.d +++ b/binutils/testsuite/binutils-all/strip-15.d @@ -4,5 +4,5 @@ Relocation section '\.rela?\.text' at offset .* contains 2 entries: *Offset * Info * Type * Sym\. *Value * Sym\. *Name(?: * \+ * Addend)? -0+00 * 0+0(?:1|32|103) * R_[^ ]* *(?: * 55aa)? +0+00 * 0+0(?:1|b|32|103) * R_[^ ]* *(?: * 55aa)? #pass -- 2.34.1