Fix PREL31 relocation on ARM

Summary:
This is a 31bits relative relocation instead of a 32bits absolute relocation.

Reviewers: t.p.northover, peter.smith, rengolin

Subscribers: aemerson, llvm-commits, samparker

Differential Revision: https://reviews.llvm.org/D25069

llvm-svn: 284780
This commit is contained in:
Keno Fischer 2016-10-20 21:15:29 +00:00
parent ae8887d98b
commit df5354029f
2 changed files with 27 additions and 0 deletions

View File

@ -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;

View File

@ -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