maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Resurrect code that was lost in conflicting commits. 

llvm-svn: 275693
This commit is contained in:
Rui Ueyama 2016-07-16 18:45:25 +00:00
parent f953a8ac17
commit 962b277d2d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/SymbolTable.cpp
View File

@ -576,7 +576,7 @@ static void setVersionId(SymbolBody *Body, StringRef VersionName,
}
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;
}