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

[ELF] Change SharedFile::soName from std::string to StringRef

This commit is contained in:
Fangrui Song 2021-10-25 15:54:04 -07:00
parent 16e530d43b
commit 4d9f6caee3
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lld/ELF/Driver.cpp
View File

@ -262,16 +262,11 @@ void LinkerDriver::addFile(StringRef path, bool withLOption) {
return;
}
// DSOs usually have DT_SONAME tags in their ELF headers, and the
// sonames are used to identify DSOs. But if they are missing,
// they are identified by filenames. We don't know whether the new
// file has a DT_SONAME or not because we haven't parsed it yet.
// Here, we set the default soname for the file because we might
// need it later.
//
// If a file was specified by -lfoo, the directory part is not
// significant, as a user did not specify it. This behavior is
// compatible with GNU.
// Shared objects are identified by soname. soname is (if specified)
// DT_SONAME and falls back to filename. If a file was specified by -lfoo,
// the directory part is ignored. Note that path may be a temporary and
// cannot be stored into SharedFile::soName.
path = mbref.getBufferIdentifier();
files.push_back(
make<SharedFile>(mbref, withLOption ? path::filename(path) : path));
return;

4
lld/ELF/InputFiles.h
View File

@ -356,7 +356,7 @@ public:
class SharedFile : public ELFFileBase {
public:
SharedFile(MemoryBufferRef m, StringRef defaultSoName)
: ELFFileBase(SharedKind, m), soName(std::string(defaultSoName)),
: ELFFileBase(SharedKind, m), soName(defaultSoName),
isNeeded(!config->asNeeded) {}
// This is actually a vector of Elf_Verdef pointers.
@ -370,7 +370,7 @@ public:
static unsigned vernauxNum;
std::vector<StringRef> dtNeeded;
std::string soName;
StringRef soName;
static bool classof(const InputFile *f) { return f->kind() == SharedKind; }