From: Phil Blundell <philb@gnu.org>
Date: Wed, 17 Jun 2009 15:46:18 +0000 (+0000)
Subject: Undo accidental checkin of bogus change
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4116d8d7c53ce048379ead27848e4a9a54770f15;p=deliverable%2Fbinutils-gdb.git

Undo accidental checkin of bogus change
---

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.  */