From: Thomas Preud'homme <thomas.preudhomme@arm.com>
Date: Thu, 14 Jan 2016 10:00:24 +0000 (+0800)
Subject: 2016-06-20  Thomas Preud'homme  <thomas.preudhomme@arm.com>
X-Git-Tag: users/ARM/embedded-gdb-2_26-branch-2016q1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f504539f11c0431391faf482d624e4e9dca2ae2;p=thirdparty%2Fbinutils-gdb.git

2016-06-20  Thomas Preud'homme  <thomas.preudhomme@arm.com>

	Backport from mainline
	Fix Thumb-Thumb farcall v6-M (no profile) test

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

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

diff --git a/ld/testsuite/ChangeLog.arm b/ld/testsuite/ChangeLog.arm
index 9585711ea20..aeb1b7d690b 100644
--- a/ld/testsuite/ChangeLog.arm
+++ b/ld/testsuite/ChangeLog.arm
@@ -1,3 +1,15 @@
+2016-06-20  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	Backport from mainline
+	2016-01-14  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* ld-arm/arm-elf.exp (Thumb-Thumb farcall v6-M (no profile)): Set
+	address of .foo section when linking.
+	* ld-arm/farcall-thumb-thumb-m-no-profile-b.s: Place myfunc in .foo
+	section.
+	* ld-arm/farcall-thumb-thumb-m-no-profile.d: Adapt expected output to
+	the above changes.
+
 2016-06-20  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	Backport from mainline
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 3c21e10a156..25dfe5cb444 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -470,7 +470,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 6590021351d..7212be05a36 100644
--- 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 639fe5aa9f2..7d89b52e020 100644
--- 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