diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 614e3967130f..cc6d51efb0ba 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/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/llvm/test/MC/ELF/pic-diff.s b/llvm/test/MC/ELF/pic-diff.s
index 155754717a34..099ae1f0ad63 100644
--- a/llvm/test/MC/ELF/pic-diff.s
+++ b/llvm/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