Revert "ARM STM32L4XX erratum test failure"

This reverts commit 3a1bb98c3c4f983b950fbaf2797ddcd21fcb5211.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 22a69fb78ab8bac5467772c1d40d7a688f9a010a..e3729bbf1f007f5adcab0f7e2f6abd3be2804f8a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-16  Alan Modra  <amodra@gmail.com>
+
+       * elf32-arm.c (elf32_arm_write_section): Revert last change.
+
 2019-05-15  Alan Modra  <amodra@gmail.com>
 
        * elf32-arm.c (elf32_arm_write_section): Don't leave

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index a8d57019c855e192eb6f997554295f562d15f18d..337961d26e16c6458f41d54b2e8dbe6891a5017c 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -19693,9 +19693,6 @@ elf32_arm_write_section (bfd *output_bfd,
                bfd_vma branch_to_veneer =
                  stm32l4xx_errnode->u.b.veneer->vma - stm32l4xx_errnode->vma;
 
-               /* The instruction is before the label.  */
-               target -= 4;
-
                if ((signed) branch_to_veneer < -(1 << 24)
                    || (signed) branch_to_veneer >= (1 << 24))
                  {
@@ -19713,15 +19710,15 @@ elf32_arm_write_section (bfd *output_bfd,
                       output_bfd,
                       (uint64_t) (stm32l4xx_errnode->vma - 4),
                       (int64_t) out_of_range);
-
-                   /* Don't leave contents uninitialised.  */
-                   bfd_put_16 (output_bfd, 0, contents + target);
                    continue;
                  }
 
                insn = create_instruction_branch_absolute
                  (stm32l4xx_errnode->u.b.veneer->vma - stm32l4xx_errnode->vma);
 
+               /* The instruction is before the label.  */
+               target -= 4;
+
                put_thumb2_insn (globals, output_bfd,
                                 (bfd_vma) insn, contents + target);
              }