[PATCH] D25069: Fix PREL31 relocation on ARM
Yichao Yu via llvm-commits
llvm-commits at lists.llvm.org
Sun Oct 9 19:36:47 PDT 2016
yuyichao updated this revision to Diff 74091.
yuyichao added a comment.
Add test.
https://reviews.llvm.org/D25069
Files:
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s
Index: test/ExecutionEngine/RuntimeDyld/ARM/ELF_ARM_EXIDX_relocations.s
===================================================================
--- /dev/null
+++ 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
Index: lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
===================================================================
--- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -463,7 +463,11 @@
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;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25069.74091.patch
Type: text/x-patch
Size: 1686 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161010/3bb2aff7/attachment.bin>
More information about the llvm-commits
mailing list