diff options
| author | Alan Modra <amodra@gmail.com> | 2019-05-16 22:35:25 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-05-16 22:37:25 +0930 |
| commit | a2699ef206aedf8e8d49d8519ae8a535e4b4afe5 (patch) | |
| tree | 77d5580c1e13f0129906a9b762c00d17c8800307 | |
| parent | 4d8d49e80ab6964a211ec3507be22c092afcd83a (diff) | |
Revert "ARM STM32L4XX erratum test failure"
This reverts commit 3a1bb98c3c4f983b950fbaf2797ddcd21fcb5211.
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 22a69fb78a..e3729bbf1f 100644 --- 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 a8d57019c8..337961d26e 100644 --- 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); } |