diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2010-10-06 08:22:21 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2010-10-06 08:22:21 +0000 |
| commit | 9ae92b05ccb5564c6546bff1b0e5861b2d32a34a (patch) | |
| tree | 10bc1033692062a23fa38fd110687577187dccd2 /bfd | |
| parent | bd0ca0f78b3a540b0825f2dec418090165e931c0 (diff) | |
| download | gdb-9ae92b05ccb5564c6546bff1b0e5861b2d32a34a.zip gdb-9ae92b05ccb5564c6546bff1b0e5861b2d32a34a.tar.gz gdb-9ae92b05ccb5564c6546bff1b0e5861b2d32a34a.tar.bz2 | |
bfd/
* elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic,
elf32_arm_stub_long_branch_any_arm_pic): Use a consistent name for
ip/r12.
(arm_type_of_stub): Remove superfluous braces.
gas/
* config/tc-arm.c (encode_branch): Remove superfluous braces.
(do_t_branch): Move reloc setting to end of routine.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f7d2587..c21a0f9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2010-10-06 Nathan Sidwell <nathan@codesourcery.com> + + * elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic, + elf32_arm_stub_long_branch_any_arm_pic): Use a consistent name for + ip/r12. + (arm_type_of_stub): Remove superfluous braces. + 2010-10-04 Bernd Schmidt <bernds@codesourcery.com> * elf-bfd.h (struct bfd_elf_section_reloc_data): New structure. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index fb3e0a3..8728949 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -2106,7 +2106,7 @@ static const insn_sequence elf32_arm_stub_short_branch_v4t_thumb_arm[] = blx to reach the stub if necessary. */ static const insn_sequence elf32_arm_stub_long_branch_any_arm_pic[] = { - ARM_INSN(0xe59fc000), /* ldr r12, [pc] */ + ARM_INSN(0xe59fc000), /* ldr ip, [pc] */ ARM_INSN(0xe08ff00c), /* add pc, pc, ip */ DATA_WORD(0, R_ARM_REL32, -4), /* dcd R_ARM_REL32(X-4) */ }; @@ -2117,7 +2117,7 @@ static const insn_sequence elf32_arm_stub_long_branch_any_arm_pic[] = ARMv7). */ static const insn_sequence elf32_arm_stub_long_branch_any_thumb_pic[] = { - ARM_INSN(0xe59fc004), /* ldr r12, [pc, #4] */ + ARM_INSN(0xe59fc004), /* ldr ip, [pc, #4] */ ARM_INSN(0xe08fc00c), /* add ip, pc, ip */ ARM_INSN(0xe12fff1c), /* bx ip */ DATA_WORD(0, R_ARM_REL32, 0), /* dcd R_ARM_REL32(X) */ @@ -3269,9 +3269,7 @@ arm_type_of_stub (struct bfd_link_info *info, /* If a stub is needed, record the actual destination type. */ if (stub_type != arm_stub_none) - { - *actual_st_type = st_type; - } + *actual_st_type = st_type; return stub_type; } |