From a536f077fef2a5bad1c87fdafd8e4c81de8e6762 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Tue, 24 Aug 2010 17:34:39 +0000
Subject: [PATCH] Relocate against parent if the symbol is not in section or
 it's a common symbol, from Roman Divacky.

llvm-svn: 111925
---
 llvm/lib/MC/ELFObjectWriter.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 3b07a53f06fb..8fb6ff60f890 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -477,7 +477,8 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
     const MCSymbolData *Base = Asm.getAtom(Layout, &SD);
 
     if (Base) {
-      if (MCFragment *F = SD.getFragment()) {
+      MCFragment *F = SD.getFragment();
+      if (F && (!Symbol->isInSection() || SD.isCommon())) {
         Index = F->getParent()->getOrdinal() + LocalSymbolData.size() + 1;
         Value += Layout.getSymbolAddress(&SD);
       } else