commit fb5cd6085fc16a5062ea2ae9097e07ebacf5e998
author James Molloy <james.molloy@arm.com> Fri Mar 30 09:15:32 2012 +0000
committer James Molloy <james.molloy@arm.com> Fri Mar 30 09:15:32 2012 +0000
tree 0819b88df32576a8725597f29e280cbea7f59f5a
parent 609089f2544d25df617dbfbf6ef9d6299fb6ff65

Ensure conditional BL instructions for ARM are given the fixup fixup_arm_condbranch.

Patch by Tim Northover!

llvm-svn: 153737

llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
index 98a8bf5..aa649ba 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -178,7 +178,7 @@
         break;
       }
       break;
-    case ARM::fixup_arm_bl:
+    case ARM::fixup_arm_uncondbl:
     case ARM::fixup_arm_blx:
     case ARM::fixup_arm_uncondbranch:
       switch (Modifier) {
@@ -190,6 +190,7 @@
         break;
       }
       break;
+    case ARM::fixup_arm_condbl:
     case ARM::fixup_arm_condbranch:
       Type = ELF::R_ARM_JUMP24;
       break;