projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid the deprecated GetVersionEx API
[oota-llvm.git]
/
lib
/
LibDriver
/
LibDriver.cpp
diff --git
a/lib/LibDriver/LibDriver.cpp
b/lib/LibDriver/LibDriver.cpp
index cb3278c716e6f9a8a3d4bc09485f020a989f215b..3ae5434607453d2f0c0a23dd301d1150532f4dcf 100644
(file)
--- a/
lib/LibDriver/LibDriver.cpp
+++ b/
lib/LibDriver/LibDriver.cpp
@@
-8,7
+8,7
@@
//===----------------------------------------------------------------------===//
//
// Defines an interface to a lib.exe-compatible driver that also understands
//===----------------------------------------------------------------------===//
//
// Defines an interface to a lib.exe-compatible driver that also understands
-// bitcode files. Used by llvm-lib and lld-link
2
/lib.
+// bitcode files. Used by llvm-lib and lld-link /lib.
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
@@
-51,22
+51,18
@@
static const llvm::opt::OptTable::Info infoTable[] = {
class LibOptTable : public llvm::opt::OptTable {
public:
class LibOptTable : public llvm::opt::OptTable {
public:
- LibOptTable() : OptTable(infoTable,
llvm::array_lengthof(infoTable),
true) {}
+ LibOptTable() : OptTable(infoTable, true) {}
};
}
};
}
-static std::string getOutputPath(llvm::opt::InputArgList *Args) {
+static std::string getOutputPath(llvm::opt::InputArgList *Args,
+ const llvm::NewArchiveIterator &FirstMember) {
if (auto *Arg = Args->getLastArg(OPT_out))
return Arg->getValue();
if (auto *Arg = Args->getLastArg(OPT_out))
return Arg->getValue();
- for (auto *Arg : Args->filtered(OPT_INPUT)) {
- if (!StringRef(Arg->getValue()).endswith_lower(".obj"))
- continue;
- SmallString<128> Val = StringRef(Arg->getValue());
- llvm::sys::path::replace_extension(Val, ".lib");
- return Val.str();
- }
- llvm_unreachable("internal error");
+ SmallString<128> Val = FirstMember.getNew();
+ llvm::sys::path::replace_extension(Val, ".lib");
+ return Val.str();
}
static std::vector<StringRef> getSearchPaths(llvm::opt::InputArgList *Args,
}
static std::vector<StringRef> getSearchPaths(llvm::opt::InputArgList *Args,
@@
-106,7
+102,7
@@
static Optional<std::string> findInputFile(StringRef File,
int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
SmallVector<const char *, 20> NewArgs(ArgsArr.begin(), ArgsArr.end());
BumpPtrAllocator Alloc;
int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
SmallVector<const char *, 20> NewArgs(ArgsArr.begin(), ArgsArr.end());
BumpPtrAllocator Alloc;
-
BumpPtr
StringSaver Saver(Alloc);
+ StringSaver Saver(Alloc);
cl::ExpandResponseFiles(Saver, cl::TokenizeWindowsCommandLine, NewArgs);
ArgsArr = NewArgs;
cl::ExpandResponseFiles(Saver, cl::TokenizeWindowsCommandLine, NewArgs);
ArgsArr = NewArgs;
@@
-139,12
+135,14
@@
int llvm::libDriverMain(llvm::ArrayRef<const char*> ArgsArr) {
llvm::errs() << Arg->getValue() << ": no such file or directory\n";
return 1;
}
llvm::errs() << Arg->getValue() << ": no such file or directory\n";
return 1;
}
- Members.emplace_back(Saver.save(*Path),
- llvm::sys::path::filename(Arg->getValue()));
+ Members.emplace_back(Saver.save(*Path));
}
std::pair<StringRef, std::error_code> Result =
}
std::pair<StringRef, std::error_code> Result =
- llvm::writeArchive(getOutputPath(&Args), Members, /*WriteSymtab=*/true);
+ llvm::writeArchive(getOutputPath(&Args, Members[0]), Members,
+ /*WriteSymtab=*/true, object::Archive::K_GNU,
+ /*Deterministic*/ true, Args.hasArg(OPT_llvmlibthin));
+
if (Result.second) {
if (Result.first.empty())
Result.first = ArgsArr[0];
if (Result.second) {
if (Result.first.empty())
Result.first = ArgsArr[0];