[lld] r275693 - Resurrect code that was lost in conflicting commits.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Sat Jul 16 13:45:25 2016
New Revision: 275693

URL: http://llvm.org/viewvc/llvm-project?rev=275693&view=rev
Log:
Resurrect code that was lost in conflicting commits.

Modified:
    lld/trunk/ELF/SymbolTable.cpp

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=275693&r1=275692&r2=275693&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Sat Jul 16 13:45:25 2016
@@ -576,7 +576,7 @@ static void setVersionId(SymbolBody *Bod
   }
 
   Symbol *Sym = Body->symbol();
-  if (Sym->VersionId != VER_NDX_GLOBAL && Sym->VersionId != VER_NDX_LOCAL)
+  if (Sym->VersionId != Config->DefaultSymbolVersion)
     warning("duplicate symbol " + Name + " in version script");
   Sym->VersionId = Version;
 }