Correctly compute the relocation when it is not in the first fragment.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115506 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 614e3967130f06719a639bda5c656e1a76825a84..cc6d51efb0bafbe0edb004a03b453fd6d655dd49 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -539,7 +539,7 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
       const MCSymbol &SymbolB = RefB->getSymbol();
       MCSymbolData &SDB = Asm.getSymbolData(SymbolB);
       IsPCRel = true;
-      Value += Fixup.getOffset() - Layout.getSymbolAddress(&SDB);
+      Value += Layout.getFragmentOffset(Fragment) + Fixup.getOffset() - Layout.getSymbolAddress(&SDB);
     }
 
     // Check that this case has already been fully resolved before we get

diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index 155754717a347fe4ab8db0da44b75498cc68b70f..099ae1f0ad63cd0940297a765e8818472a8b35e6 100644 (file)
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -19,7 +19,8 @@
 // CHECK-NEXT:    ),
 // CHECK-NEXT:   ])
 
-.zero 4
+.zero 1
+.align 4
 foo:
 .zero 8
 .long baz - foo