diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2010-10-06 08:22:19 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2010-10-06 08:22:19 +0000 |
| commit | dbbc9f7255e923d31e27ec4c03a3eb196fe7a386 (patch) | |
| tree | 1252c92ab25c8ac697d77ac5cd3b3023fd0dcf72 /gas/config/tc-arm.c | |
| parent | df37482471dd8de6b44f9b470513423224ac981c (diff) | |
| download | binutils-redhat-dbbc9f7255e923d31e27ec4c03a3eb196fe7a386.tar.gz | |
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 'gas/config/tc-arm.c')
| -rw-r--r-- | gas/config/tc-arm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index fc3d63d5e5..69ff36a680 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -7285,9 +7285,7 @@ encode_branch (int default_reloc) inst.reloc.type = BFD_RELOC_ARM_PLT32; } else - { - inst.reloc.type = (bfd_reloc_code_real_type) default_reloc; - } + inst.reloc.type = (bfd_reloc_code_real_type) default_reloc; inst.reloc.pc_rel = 1; } @@ -9666,6 +9664,7 @@ do_t_branch (void) { int opcode; int cond; + int reloc; cond = inst.cond; set_it_insn_type (IF_INSIDE_IT_LAST_INSN); @@ -9688,29 +9687,29 @@ do_t_branch (void) { inst.instruction = THUMB_OP32(opcode); if (cond == COND_ALWAYS) - inst.reloc.type = BFD_RELOC_THUMB_PCREL_BRANCH25; + reloc = BFD_RELOC_THUMB_PCREL_BRANCH25; else { gas_assert (cond != 0xF); inst.instruction |= cond << 22; - inst.reloc.type = BFD_RELOC_THUMB_PCREL_BRANCH20; + reloc = BFD_RELOC_THUMB_PCREL_BRANCH20; } } else { inst.instruction = THUMB_OP16(opcode); if (cond == COND_ALWAYS) - inst.reloc.type = BFD_RELOC_THUMB_PCREL_BRANCH12; + reloc = BFD_RELOC_THUMB_PCREL_BRANCH12; else { inst.instruction |= cond << 8; - inst.reloc.type = BFD_RELOC_THUMB_PCREL_BRANCH9; + reloc = BFD_RELOC_THUMB_PCREL_BRANCH9; } /* Allow section relaxation. */ if (unified_syntax && inst.size_req != 2) inst.relax = opcode; } - + inst.reloc.type = reloc; inst.reloc.pc_rel = 1; } |