Merge pull request #60 from japaric/gh38406

Add relocations for fixups fixup_arm_thumb_{br,bcc}

Author: alexcrichton

lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp

@@ -140,6 +140,12 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
     case ARM::fixup_t2_movw_lo16:
       Type = ELF::R_ARM_THM_MOVW_PREL_NC;
       break;
+    case ARM::fixup_arm_thumb_br:
+      Type = ELF::R_ARM_THM_JUMP11;
+      break;
+    case ARM::fixup_arm_thumb_bcc:
+      Type = ELF::R_ARM_THM_JUMP8;
+      break;
     case ARM::fixup_arm_thumb_bl:
     case ARM::fixup_arm_thumb_blx:
       switch (Modifier) {

test/MC/ARM/thumb1-branch-reloc.s

@@ -0,0 +1,21 @@
+@ RUN: llvm-mc -triple thumbv6-eabi -filetype obj -o - %s | llvm-readobj -r - \
+@ RUN:     | FileCheck %s
+
+        .syntax unified
+
+        .extern h
+        .section .text.uncond
+
+        b h
+        
+@CHECK: Section {{.*}} .rel.text.uncond {
+@CHECK:   0x0 R_ARM_THM_JUMP11
+@CHECK: }
+        .section .text.cond
+
+        ble h
+
+@CHECK: Section {{.*}} .rel.text.cond {
+@CHECK:   0x0 R_ARM_THM_JUMP8
+@CHECK: }
+