SymbolVersions sounds like it had versions for a symbol, so rename it.
llvm-svn: 275674
llvm::StringRef Sysroot;
llvm::StringSet<> TraceSymbol;
std::string RPath;
- std::vector<VersionDefinition> SymbolVersions;
+ std::vector<VersionDefinition> VersionDefinitions;
std::vector<llvm::StringRef> DynamicList;
std::vector<llvm::StringRef> SearchPaths;
std::vector<llvm::StringRef> Undefined;
// Returns the number of version definition entries. Because the first entry
// is for the version definition itself, it is the number of versioned symbols
// plus one. Note that we don't support multiple versions yet.
-static unsigned getVerDefNum() { return Config->SymbolVersions.size() + 1; }
+static unsigned getVerDefNum() { return Config->VersionDefinitions.size() + 1; }
template <class ELFT>
DynamicSection<ELFT>::DynamicSection()
template <class ELFT> void VersionDefinitionSection<ELFT>::finalize() {
FileDefNameOff = Out<ELFT>::DynStrTab->addString(getFileDefName());
- for (VersionDefinition &V : Config->SymbolVersions)
+ for (VersionDefinition &V : Config->VersionDefinitions)
V.NameOff = Out<ELFT>::DynStrTab->addString(V.Name);
this->Header.sh_size =
void VersionDefinitionSection<ELFT>::writeTo(uint8_t *Buf) {
writeOne(Buf, 1, getFileDefName(), FileDefNameOff);
- for (VersionDefinition &V : Config->SymbolVersions) {
+ for (VersionDefinition &V : Config->VersionDefinitions) {
Buf += sizeof(Elf_Verdef) + sizeof(Elf_Verdaux);
writeOne(Buf, V.Id, V.Name, V.NameOff);
}
size_t elf::defineSymbolVersion(StringRef VerStr) {
// Identifiers start at 2 because 0 and 1 are reserved
// for VER_NDX_LOCAL and VER_NDX_GLOBAL constants.
- size_t VersionId = Config->SymbolVersions.size() + 2;
- Config->SymbolVersions.push_back({VerStr, VersionId});
+ size_t VersionId = Config->VersionDefinitions.size() + 2;
+ Config->VersionDefinitions.push_back({VerStr, VersionId});
return VersionId;
}
if (VerStr.empty())
Globals = &Config->VersionScriptGlobals;
else
- Globals = &Config->SymbolVersions.back().Globals;
+ Globals = &Config->VersionDefinitions.back().Globals;
for (;;) {
StringRef Cur = peek();
if (Default)
Version = Version.drop_front();
- for (VersionDefinition &V : Config->SymbolVersions)
+ for (VersionDefinition &V : Config->VersionDefinitions)
if (V.Name == Version)
return Default ? V.Id : (V.Id | VERSYM_HIDDEN);
return;
}
- if (Config->SymbolVersions.empty())
+ if (Config->VersionDefinitions.empty())
return;
// If we have symbols version declarations, we should
// * Otherwise, we look through the wildcard patterns. We look through the
// version tags in reverse order. We use the first match we find (the last
// matching version tag in the file).
- for (size_t I = 0, E = Config->SymbolVersions.size(); I < E; ++I) {
- VersionDefinition &V = Config->SymbolVersions[I];
+ for (size_t I = 0, E = Config->VersionDefinitions.size(); I < E; ++I) {
+ VersionDefinition &V = Config->VersionDefinitions[I];
for (StringRef Name : V.Globals) {
if (hasWildcard(Name))
continue;
}
}
- for (size_t I = Config->SymbolVersions.size() - 1; I != (size_t)-1; --I) {
- VersionDefinition &V = Config->SymbolVersions[I];
+ for (size_t I = Config->VersionDefinitions.size() - 1; I != (size_t)-1; --I) {
+ VersionDefinition &V = Config->VersionDefinitions[I];
for (StringRef Name : V.Globals)
if (hasWildcard(Name))
for (SymbolBody *B : findAll(Name))
MipsRldMap->setSize(sizeof(uintX_t));
MipsRldMap->updateAlignment(sizeof(uintX_t));
}
- if (!Config->SymbolVersions.empty())
+ if (!Config->VersionDefinitions.empty())
VerDef.reset(new VersionDefinitionSection<ELFT>());
Out<ELFT>::Bss = &Bss;