diff options
| author | Rui Ueyama <ruiu@google.com> | 2016-07-16 18:45:25 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2016-07-16 18:45:25 +0000 |
| commit | 962b277d2d6433ea057ec7f35d22a36739e656b8 (patch) | |
| tree | 1ba9d629f6c7dddd999f90b2d7977d41f8d75f3d | |
| parent | f953a8ac17a0cde72bfe298d4a4df58a1d62fc83 (diff) | |
| download | bcm5719-llvm-962b277d2d6433ea057ec7f35d22a36739e656b8.tar.gz bcm5719-llvm-962b277d2d6433ea057ec7f35d22a36739e656b8.zip | |
Resurrect code that was lost in conflicting commits.
llvm-svn: 275693
| -rw-r--r-- | lld/ELF/SymbolTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index 590f01f602d..ad78b4c7790 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -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; } |
