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

ELF: Simplify LinkerScript detection. NFC. 

llvm-svn: 235895
This commit is contained in:
Rui Ueyama 2015-04-27 16:54:48 +00:00
parent 937ff6e9c6
commit de9215e498
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lld/lib/Driver/GnuLdDriver.cpp
View File

@ -112,22 +112,6 @@ maybeExpandResponseFiles(int argc, const char **argv, BumpPtrAllocator &alloc) {
return std::make_tuple(argc, copy); return std::make_tuple(argc, copy);
} }
static std::error_code
getFileMagic(StringRef path, llvm::sys::fs::file_magic &magic) {
std::error_code ec = llvm::sys::fs::identify_magic(path, magic);
if (ec)
return ec;
switch (magic) {
case llvm::sys::fs::file_magic::archive:
case llvm::sys::fs::file_magic::elf_relocatable:
case llvm::sys::fs::file_magic::elf_shared_object:
case llvm::sys::fs::file_magic::unknown:
return std::error_code();
default:
return make_dynamic_error_code("unknown type of object file");
}
}
// Parses an argument of --defsym=<sym>=<number> // Parses an argument of --defsym=<sym>=<number>
static bool parseDefsymAsAbsolute(StringRef opt, StringRef &sym, static bool parseDefsymAsAbsolute(StringRef opt, StringRef &sym,
uint64_t &addr) { uint64_t &addr) {
@ -214,9 +198,9 @@ getArchType(const llvm::Triple &triple, StringRef value) {
static bool isLinkerScript(StringRef path, raw_ostream &diag) { static bool isLinkerScript(StringRef path, raw_ostream &diag) {
llvm::sys::fs::file_magic magic = llvm::sys::fs::file_magic::unknown; llvm::sys::fs::file_magic magic = llvm::sys::fs::file_magic::unknown;
std::error_code ec = getFileMagic(path, magic); if (std::error_code ec = llvm::sys::fs::identify_magic(path, magic)) {
if (ec) { diag << "unknown input file format: " << path << ": "
diag << "unknown input file format for file " << path << "\n"; << ec.message() << "\n";
return false; return false;
} }
return magic == llvm::sys::fs::file_magic::unknown; return magic == llvm::sys::fs::file_magic::unknown;