Fix Thumb-Thumb farcall v6-M (no profile) test

2016-01-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>

ld/
    * testsuite/ld-arm/arm-elf.exp (Thumb-Thumb farcall v6-M (no profile)):
    Set address of .foo section when linking.
    * testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s: Place myfunc
    in .foo section.
    * testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d: Adapt expected
    output to the above changes.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 12cda4ec6b60ecae6f3d414dccb53631f87189d8..09e11f525105d2d3ecbba11b6e339ca33388c65c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       * testsuite/ld-arm/arm-elf.exp (Thumb-Thumb farcall v6-M (no profile)):
+       Set address of .foo section when linking.
+       * testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s: Place myfunc
+       in .foo section.
+       * testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d: Adapt expected
+       output to the above changes.
+
 2016-01-13  Nick Clifton  <nickc@redhat.com>
 
        * testsuite/ld-elf/elf.exp (-Bymsolic-functions): Expect to fail

diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 70ca829835a847f25293cc6892d2ed71e37bb4c7..89cec661b4bf4e35d22019d9e82164d71f0571db 100644 (file)
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -481,7 +481,7 @@ set armeabitests_nonacl {
     {"Thumb-Thumb farcall (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001014 --pic-veneer" "" "-march=armv4t" {farcall-thumb-thumb.s}
      {{objdump -d farcall-thumb-thumb-pic-veneer.d}}
      "farcall-thumb-thumb-pic-veneer"}
-    {"Thumb-Thumb farcall v6-M (no profile)" "-Ttext 0x1000" "" ""
+    {"Thumb-Thumb farcall v6-M (no profile)" "-Ttext 0x1000 --section-start .foo=0x2001014" "" ""
      {farcall-thumb-thumb-m-no-profile-a.s farcall-thumb-thumb-m-no-profile-b.s}
      {{objdump -d farcall-thumb-thumb-m-no-profile.d}}
      "farcall-thumb-thumb-m-no-profile"}

diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s
index 6590021351d77fa321fde23d5b05bb4ce5a7d612..7212be05a36b432d34a6debb52e506590d2bbc68 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile-b.s
@@ -2,7 +2,6 @@
        .thumb
        .type myfunc, function
        .global myfunc
-       .text
-       .space 102400000
+       .section .foo, "xa"
 myfunc:
        bx      lr

diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d
index 639fe5aa9f2d47e439d0bfde79a6a945b89589af..7d89b52e0205e147a1371e54f0b2936461976c38 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d
+++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d
@@ -14,11 +14,9 @@ Disassembly of section .text:
     100e:      bc01            pop     {r0}
     1010:      4760            bx      ip
     1012:      bf00            nop
-    1014:      061a9019        .word   0x061a9019
-       \.\.\.
+    1014:      02001015        .word   0x02001015
 
-00080000 <_stack>:
-       \.\.\.
+Disassembly of section .foo:
 
-061a9018 <myfunc>:
- 61a9018:      4770            bx      lr
+02001014 <myfunc>:
+ 2001014:      4770            bx      lr