diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/symbol-variants.s | 4 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-readobj/reloc-types.test | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index a86601b6bb5..f24b4193b43 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp @@ -102,7 +102,7 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target, case ARM::fixup_arm_uncondbl: switch (Modifier) { case MCSymbolRefExpr::VK_PLT: - Type = ELF::R_ARM_PLT32; + Type = ELF::R_ARM_CALL; break; case MCSymbolRefExpr::VK_ARM_TLSCALL: Type = ELF::R_ARM_TLS_CALL; diff --git a/llvm/test/MC/ARM/symbol-variants.s b/llvm/test/MC/ARM/symbol-variants.s index a10fe5029e0..af1bc07b5e1 100644 --- a/llvm/test/MC/ARM/symbol-variants.s +++ b/llvm/test/MC/ARM/symbol-variants.s @@ -19,8 +19,8 @@ @ plt bl f04(PLT) bl f05(plt) -@ARM: 10 R_ARM_PLT32 f04 -@ARM: 14 R_ARM_PLT32 f05 +@ARM: 10 R_ARM_CALL f04 +@ARM: 14 R_ARM_CALL f05 @THUMB: 10 R_ARM_THM_CALL f04 @THUMB: 14 R_ARM_THM_CALL f05 diff --git a/llvm/test/tools/llvm-readobj/reloc-types.test b/llvm/test/tools/llvm-readobj/reloc-types.test index 03eda82a6f0..20c25380a96 100644 --- a/llvm/test/tools/llvm-readobj/reloc-types.test +++ b/llvm/test/tools/llvm-readobj/reloc-types.test @@ -261,7 +261,6 @@ ELF-ARM: Type: R_ARM_RELATIVE (23) ELF-ARM: Type: R_ARM_GOTOFF32 (24) ELF-ARM: Type: R_ARM_BASE_PREL (25) ELF-ARM: Type: R_ARM_GOT_BREL (26) -ELF-ARM: Type: R_ARM_PLT32 (27) ELF-ARM: Type: R_ARM_CALL (28) ELF-ARM: Type: R_ARM_JUMP24 (29) ELF-ARM: Type: R_ARM_THM_JUMP24 (30) |
