forked from OSchip/llvm-project
[MCJIT] Take the relocation addend into account when applying ARM MachO VANILLA
and BR24 relocations. <rdar://problem/18296496> llvm-svn: 217605
This commit is contained in:
parent
eb7c1a6e50
commit
4669cd08a7
llvm
lib/ExecutionEngine/RuntimeDyld/Targets
test/ExecutionEngine/RuntimeDyld/ARM
|
@ -101,12 +101,13 @@ public:
|
|||
default:
|
||||
llvm_unreachable("Invalid relocation type!");
|
||||
case MachO::ARM_RELOC_VANILLA:
|
||||
writeBytesUnaligned(Value, LocalAddress, 1 << RE.Size);
|
||||
writeBytesUnaligned(Value + RE.Addend, LocalAddress, 1 << RE.Size);
|
||||
break;
|
||||
case MachO::ARM_RELOC_BR24: {
|
||||
// Mask the value into the target address. We know instructions are
|
||||
// 32-bit aligned, so we can do it all at once.
|
||||
uint32_t *p = (uint32_t *)LocalAddress;
|
||||
Value += RE.Addend;
|
||||
// The low two bits of the value are not encoded.
|
||||
Value >>= 2;
|
||||
// Mask the value to 24 bits.
|
||||
|
|
|
@ -34,6 +34,9 @@ insn3:
|
|||
foo:
|
||||
bx lr
|
||||
|
||||
# Add 'aaa' to the common symbols to make sure 'baz' isn't at the start of the
|
||||
# section. This ensures that we test VANILLA relocation addends correctly.
|
||||
.comm aaa, 4, 2
|
||||
.comm baz, 4, 2
|
||||
|
||||
.subsections_via_symbols
|
||||
|
|
Loading…
Reference in New Issue