diff options
Diffstat (limited to 'lib/MC')
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 12 | ||||
| -rw-r--r-- | lib/MC/MachObjectWriter.cpp | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 4dbb5387f3..629d746826 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -1503,7 +1503,7 @@ unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target, break; } break; - case ARM::fixup_arm_branch: + case ARM::fixup_arm_uncondbranch: switch (Modifier) { case MCSymbolRefExpr::VK_ARM_PLT: Type = ELF::R_ARM_PLT32; @@ -1513,6 +1513,9 @@ unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target, break; } break; + case ARM::fixup_arm_condbranch: + Type = ELF::R_ARM_JUMP24; + break; case ARM::fixup_arm_movt_hi16: case ARM::fixup_arm_movt_hi16_pcrel: Type = ELF::R_ARM_MOVT_PREL; @@ -1565,11 +1568,12 @@ unsigned ARMELFObjectWriter::GetRelocType(const MCValue &Target, case ARM::fixup_arm_thumb_br: assert(0 && "Unimplemented"); break; - case ARM::fixup_arm_branch: - // FIXME: Differentiate between R_ARM_CALL and - // R_ARM_JUMP24 (latter used for conditional jumps) + case ARM::fixup_arm_uncondbranch: Type = ELF::R_ARM_CALL; break; + case ARM::fixup_arm_condbranch: + Type = ELF::R_ARM_JUMP24; + break; case ARM::fixup_arm_movt_hi16: Type = ELF::R_ARM_MOVT_ABS; break; diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index 1fb0f99ba4..8af07c74fd 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -940,7 +940,8 @@ public: case ARM::fixup_arm_ldst_pcrel_12: case ARM::fixup_arm_pcrel_10: case ARM::fixup_arm_adr_pcrel_12: - case ARM::fixup_arm_branch: + case ARM::fixup_arm_condbranch: + case ARM::fixup_arm_uncondbranch: RelocType = unsigned(macho::RIT_ARM_Branch24Bit); // Report as 'long', even though that is not quite accurate. Log2Size = llvm::Log2_32(4); |