diff options
| author | Phil Blundell <philb@gnu.org> | 2009-06-17 15:46:18 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2009-06-17 15:46:18 +0000 |
| commit | eceaa2b8e7f340ce901fb0128935210c679d4d29 (patch) | |
| tree | 0b6444ea9b1bd83ea3d993e76e1274e22d403c08 /bfd/elf32-arm.c | |
| parent | e8fa4ea83618b4b530070cbd0eaeda7a0b865faa (diff) | |
| download | binutils-redhat-eceaa2b8e7f340ce901fb0128935210c679d4d29.tar.gz | |
Undo accidental checkin of bogus change
Diffstat (limited to 'bfd/elf32-arm.c')
| -rw-r--r-- | bfd/elf32-arm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index d06d3699db..e1f569b64f 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -3175,12 +3175,11 @@ arm_type_of_stub (struct bfd_link_info *info, /* We have an extra 2-bytes reach because of the mode change (bit 24 (H) of BLX encoding). */ - if ((branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2) - || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET) - || ((r_type == R_ARM_CALL) && !globals->use_blx) - || (r_type == R_ARM_JUMP24) - || (r_type == R_ARM_PLT32)) - && !use_plt) + if (branch_offset > (ARM_MAX_FWD_BRANCH_OFFSET + 2) + || (branch_offset < ARM_MAX_BWD_BRANCH_OFFSET) + || ((r_type == R_ARM_CALL) && !globals->use_blx) + || (r_type == R_ARM_JUMP24) + || (r_type == R_ARM_PLT32)) { stub_type = (info->shared | globals->pic_veneer) /* PIC stubs. */ |