[committed] arm: fix fallout from recent thumb2 detection patch

Message ID 20210512104749.472834-1-rearnsha@arm.com
State New
Headers show
Series
  • [committed] arm: fix fallout from recent thumb2 detection patch
Related show

Commit Message

H.J. Lu via Binutils May 12, 2021, 10:47 a.m.
The recent change to correct the detection of thumb2 object files
resulted in a ld test for veneering starting to fail.  The problem was
the test itself, which was incorrectly expecting thumb1 type far-call
veneers instead of the thumb2 flavour.  We already have a dump file of
the expected form, so the fix is to change the expected output
accordingly.

ld/

	* testsuite/ld-arm/arm-elf.exp (farcall test for v8-m.mainline):
	Correct expected output.
---
 ld/ChangeLog                    | 5 +++++
 ld/testsuite/ld-arm/arm-elf.exp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/ld/ChangeLog b/ld/ChangeLog
index eec797754ed..77b10eb86df 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@ 
+2021-05-12  Richard Earnshaw  <rearnsha@arm.com>
+
+	* testsuite/ld-arm/arm-elf.exp (farcall test for v8-m.mainline):
+	Correct expected output.
+
 2021-05-11  Roland McGrath  <mcgrathr@google.com>
 
 	* testsuite/ld-x86-64/rela.d: Fix regexp not to presume a specific
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index ea1d1e1345a..9bad9b8859b 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -575,7 +575,7 @@  set armeabitests_nonacl {
      {{objdump -d farcall-thumb-thumb-m.d}}
      "farcall-thumb-thumb-v8-m-base"}
     {"Thumb-Thumb farcall v8-M Mainline" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv8-m.main" {farcall-thumb-thumb.s}
-     {{objdump -d farcall-thumb-thumb-m.d}}
+     {{objdump -d farcall-thumb2-thumb2-m.d}}
      "farcall-thumb-thumb-v8-m-main"}
     {"Thumb-Thumb farcall v6-M" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv6-m" {farcall-thumb-thumb.s}
      {{objdump -d farcall-thumb-thumb-m.d}}