diff options
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp index cffd6e08cb4..d51461931a6 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp @@ -463,7 +463,11 @@ void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section, case ELF::R_ARM_NONE: break; + // Write a 31bit signed offset case ELF::R_ARM_PREL31: + *TargetPtr &= 0x80000000; + *TargetPtr |= (Value - FinalAddress) & ~0x80000000; + break; case ELF::R_ARM_TARGET1: case ELF::R_ARM_ABS32: *TargetPtr = Value; diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s b/llvm/test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s new file mode 100644 index 00000000000..eb07b00210e --- /dev/null +++ b/llvm/test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s @@ -0,0 +1,23 @@ +# RUN: llvm-mc -triple=arm-linux-gnueabihf -filetype=obj -o %T/reloc.o %s +# RUN: llvm-rtdyld -triple=arm-linux-gnueabihf -verify -map-section reloc.o,.ARM.exidx=0x6000 -map-section reloc.o,.text=0x4000 -dummy-extern __aeabi_unwind_cpp_pr0=0x1234 -check=%s %T/reloc.o + + .text + .syntax unified + .eabi_attribute 67, "2.09" @ Tag_conformance + .cpu cortex-a8 + .fpu neon + .file "reloc.c" + .globl g + .align 2 + .type g,%function +g: + .fnstart + movw r0, #1 + bx lr + .Lfunc_end0: + .size g, .Lfunc_end0-g + .fnend + +# rtdyld-check: *{4}(section_addr(reloc.o, .ARM.exidx)) = (g - (section_addr(reloc.o, .ARM.exidx))) & 0x7fffffff +# Compat unwind info: finish(0xb0), finish(0xb0), finish(0xb0) +# rtdyld-check: *{4}(section_addr(reloc.o, .ARM.exidx) + 0x4) = 0x80b0b0b0 |
