From a863509cdddf90a3ec3b23a5b2da6d65b68c4800 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 5 Feb 2017 19:38:00 +0000
Subject: Vendor import of lld release_40 branch r294123:
 https://llvm.org/svn/llvm-project/lld/branches/release_40@294123

---
 ELF/Symbols.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ELF/Symbols.cpp')

diff --git a/ELF/Symbols.cpp b/ELF/Symbols.cpp
index 0fe42be250cf1..43af44ec4b84c 100644
--- a/ELF/Symbols.cpp
+++ b/ELF/Symbols.cpp
@@ -73,6 +73,8 @@ static typename ELFT::uint getSymVA(const SymbolBody &Body,
     return VA;
   }
   case SymbolBody::DefinedCommonKind:
+    if (!Config->DefineCommon)
+      return 0;
     return In<ELFT>::Common->OutSec->Addr + In<ELFT>::Common->OutSecOff +
            cast<DefinedCommon>(Body).Offset;
   case SymbolBody::SharedKind: {
-- 
cgit v1.2.3