diff options
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/elf-thumbfunc-reloc.s | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index e802c01fea1..cd92b75a7f0 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -813,6 +813,13 @@ bool ELFObjectWriter::shouldRelocateWithSymbol(const MCSymbolRefExpr *RefA, if (Flags & ELF::SHF_TLS) return true; + // If the symbol is a thumb function the final relocation must set the lowest + // bit. With a symbol that is done by just having the symbol have that bit + // set, so we would lose the bit if we relocated with the section. + // FIXME: We could use the section but add the bit to the relocation value. + if (SD->getFlags() & ELF_Other_ThumbFunc) + return true; + if (TargetObjectWriter->needsRelocateWithSymbol(Type)) return true; return false; diff --git a/llvm/test/MC/ARM/elf-thumbfunc-reloc.s b/llvm/test/MC/ARM/elf-thumbfunc-reloc.s index 614702012f0..ea7d507a7e8 100644 --- a/llvm/test/MC/ARM/elf-thumbfunc-reloc.s +++ b/llvm/test/MC/ARM/elf-thumbfunc-reloc.s @@ -5,7 +5,6 @@ .syntax unified .text - .globl f .align 2 .type f,%function .code 16 @@ -16,9 +15,21 @@ f: bl g pop {r7, pc} + .section .data.rel.local,"aw",%progbits +ptr: + .long f + + @@ make sure an R_ARM_THM_CALL relocation is generated for the call to g @CHECK: Relocations [ @CHECK-NEXT: Section (2) .rel.text { @CHECK-NEXT: 0x4 R_ARM_THM_CALL g 0x0 @CHECK-NEXT: } + + +@@ make sure the relocation is with f. That is one way to make sure it includes +@@ the thumb bit. +@CHECK-NEXT: Section (6) .rel.data.rel.local { +@CHECK-NEXT: 0x0 R_ARM_ABS32 f 0x0 +@CHECK-NEXT: } @CHECK-NEXT: ] |
