From 1008d3500002a64fab0a956ad681118d7af8143a Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Tue, 22 Jun 2010 23:51:47 +0000 Subject: [PATCH] Get the addend correct for i386 pic. Thanks Daniel! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106608 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MachObjectWriter.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index 79d74b92241..5a6066c6ee4 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -747,7 +747,6 @@ public: !Is64Bit && "Should only be called with a 32-bit TLVP relocation!"); - // If this is a subtraction then we're pcrel. unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind()); uint32_t Value = Layout.getFragmentOffset(Fragment)+Fixup.getOffset(); unsigned IsPCRel = 0; @@ -761,7 +760,14 @@ public: // between the picbase and the next address. For 32-bit static the addend // is zero. if (Target.getSymB()) { + // If this is a subtraction then we're pcrel. + uint32_t FixupAddress = + Layout.getFragmentAddress(Fragment) + Fixup.getOffset(); + MCSymbolData *SD_B = &Asm.getSymbolData(Target.getSymB()->getSymbol()); IsPCRel = 1; + FixedValue = (FixupAddress - Layout.getSymbolAddress(SD_B) + + Target.getConstant()); + FixedValue += 1 << Log2Size; } else { FixedValue = 0; }