mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-15 16:09:57 +00:00
[RuntimeDyld] Fix a class of arithmetic errors introduced in r253918
r253918 had refactored expressions like "A - B.Address + C" to "A - B.getAddressWithOffset(C)". This is incorrect, since the latter really computes "A - B.Address - C". None of the tests I can run locally on x86 broke due to this bug, but it is the current suspect for breakage on the AArch64 buildbots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254017 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
24dc54c6a5
commit
0a10aff3d9
@ -1259,13 +1259,13 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
|
||||
StubTargetAddr - Section.getAddress(),
|
||||
ELF::R_AARCH64_MOVW_UABS_G3, Value.Addend);
|
||||
RelocationEntry REmovk_g2(SectionID, StubTargetAddr -
|
||||
Section.getAddressWithOffset(4),
|
||||
Section.getAddress() + 4,
|
||||
ELF::R_AARCH64_MOVW_UABS_G2_NC, Value.Addend);
|
||||
RelocationEntry REmovk_g1(SectionID, StubTargetAddr -
|
||||
Section.getAddressWithOffset(8),
|
||||
Section.getAddress() + 8,
|
||||
ELF::R_AARCH64_MOVW_UABS_G1_NC, Value.Addend);
|
||||
RelocationEntry REmovk_g0(SectionID, StubTargetAddr -
|
||||
Section.getAddressWithOffset(12),
|
||||
Section.getAddress() + 12,
|
||||
ELF::R_AARCH64_MOVW_UABS_G0_NC, Value.Addend);
|
||||
|
||||
if (Value.SymbolName) {
|
||||
@ -1364,7 +1364,7 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
|
||||
RelocationEntry REHi(SectionID, StubTargetAddr - Section.getAddress(),
|
||||
ELF::R_MIPS_HI16, Value.Addend);
|
||||
RelocationEntry RELo(SectionID,
|
||||
StubTargetAddr - Section.getAddressWithOffset(4),
|
||||
StubTargetAddr - Section.getAddress() + 4,
|
||||
ELF::R_MIPS_LO16, Value.Addend);
|
||||
|
||||
if (Value.SymbolName) {
|
||||
|
Loading…
Reference in New Issue
Block a user