aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-17 15:46:18 +0000
committerPhil Blundell <philb@gnu.org>2009-06-17 15:46:18 +0000
commit4116d8d7c53ce048379ead27848e4a9a54770f15 (patch)
tree4674f336c61c0b7e68835cad61693d1030df6360 /bfd
parentea5d7a9987534b6d393a523becd3f8ce5e967641 (diff)
downloadgdb-4116d8d7c53ce048379ead27848e4a9a54770f15.zip
gdb-4116d8d7c53ce048379ead27848e4a9a54770f15.tar.gz
gdb-4116d8d7c53ce048379ead27848e4a9a54770f15.tar.bz2
Undo accidental checkin of bogus change
Diffstat (limited to 'bfd')
-rw-r--r--bfd/elf32-arm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index d06d369..e1f569b 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. */