Apply mainline patches.

	2011-11-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
	* ld/testsuite/ld-arm/jump-reloc-veneers.s: Update for changes to assembler output.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 4258e95e6130ffd8f4ae9bb061483bc426331277..233d96235299357091cb26adb689a702870f026b 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-10  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+       Apply mainline patches.
+       2011-11-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+       * ld-arm/jump-reloc-veneers.s: Update for changes to assembler output.
+
 2011-11-08  Alan Modra  <amodra@gmail.com>
 
        * ld-powerpc/powerpc.exp: Expect ld warnings for tocopt test.

diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers.s b/ld/testsuite/ld-arm/jump-reloc-veneers.s
index d307c08d5cf44616c1cbf9a47bbce341930385f7..c646e71ae090a8927c04fc1d857f4846d29002c1 100644 (file)
--- a/ld/testsuite/ld-arm/jump-reloc-veneers.s
+++ b/ld/testsuite/ld-arm/jump-reloc-veneers.s
@@ -9,4 +9,4 @@ _start:
        .section destsect, "x"
        .thumb_func
 dest:
-       b dest
+       b.n dest