projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f953a8a
)
Resurrect code that was lost in conflicting commits.
author
Rui Ueyama
<ruiu@google.com>
Sat, 16 Jul 2016 18:45:25 +0000
(18:45 +0000)
committer
Rui Ueyama
<ruiu@google.com>
Sat, 16 Jul 2016 18:45:25 +0000
(18:45 +0000)
llvm-svn: 275693
lld/ELF/SymbolTable.cpp
patch
|
blob
|
history
diff --git
a/lld/ELF/SymbolTable.cpp
b/lld/ELF/SymbolTable.cpp
index
590f01f
..
ad78b4c
100644
(file)
--- 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;
}