Remove padding before stub sections.

Lower stub alignment from 8 to 4 bytes thus removing padding between
input section content and stub section content.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5cb54ac39c2f08184068b93089a433834c160547..8c790f7cea5e89e3af0ead65088012b180013a2e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,4 +1,4 @@
-2015-03-24  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+2015-03-25  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        * elfnn-aarch64.c (_bfd_aarch64_erratum_835769_scan):
        Update erratum count.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3a6e3c3b0c0aee0ae7d19a868cab8bd9872c3b3f..78750f238c89d7a3e950c86b0e4b52e145baf626 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-24  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       * emultempl/aarch64elf.em (_aarch64_add_stub_section): Set section
+       alignment to 2.
+
 2014-12-23  Tristan Gingold  <gingold@adacore.com>
 
        * configure: Regenerate.

diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
index 42e8056f67e364065bb961a2394925bded1fb4e8..8572e5e59a6a67719094aa14cbfdc8b7f45a93bc 100644 (file)
--- a/ld/emultempl/aarch64elf.em
+++ b/ld/emultempl/aarch64elf.em
@@ -170,7 +170,7 @@ elf${ELFSIZE}_aarch64_add_stub_section (const char *stub_sec_name,
   if (stub_sec == NULL)
     goto err_ret;
 
-  bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 3);
+  bfd_set_section_alignment (stub_file->the_bfd, stub_sec, 2);
 
   output_section = input_section->output_section;
   os = lang_output_section_get (output_section);

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 3c2df32fa6e549cbb0844b7101052ce994a5050f..eacc13ffeaa71d62204420d05cd11691ec02d821 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-25  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       * ld-aarch64/erratum835769.d: Adjust for removal of padding before
+       835769 workaround stubs.
+
 2015-01-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/17773

diff --git a/ld/testsuite/ld-aarch64/erratum835769.d b/ld/testsuite/ld-aarch64/erratum835769.d
index a0402365eb61acb611f383b626c99348df44a141..1ff8d05718989e88b7e15b5d58aa747d0179881a 100644 (file)
--- a/ld/testsuite/ld-aarch64/erratum835769.d
+++ b/ld/testsuite/ld-aarch64/erratum835769.d
@@ -32,7 +32,6 @@ Disassembly of section .text:
 [ \t0-9a-f]+:[ \t0-9a-z]+[ \t]+b[ \t]+[0-9a-f]+ <__erratum_835769_veneer_2>
 [ \t0-9a-f]+:[ \t]+aa0503e0[ \t]+mov[ \t]+x0, x5
 [ \t0-9a-f]+:[ \t]+d65f03c0[ \t]+ret
-[ \t0-9a-f]+:[ \t]+00000000[ \t]+.inst[ \t]+0x00000000 ; undefined
 
 [0-9a-f]+ <__erratum_835769_veneer_2>:
 [ \t0-9a-f]+:[ \t]+9b031885[ \t]+madd[ \t]+x5, x4, x3, x6