summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2016-02-28 19:54:51 +0000
committerRui Ueyama <ruiu@google.com>2016-02-28 19:54:51 +0000
commit417553d393fbb3402151871a7c36876c10d1cd50 (patch)
tree36c29d3064feb40eb5b92f71b7fd80b89f31f564
parente7b330052fa1557ff5604ecec8d09dfb04a5827b (diff)
downloadbcm5719-llvm-417553d393fbb3402151871a7c36876c10d1cd50.tar.gz
bcm5719-llvm-417553d393fbb3402151871a7c36876c10d1cd50.zip
Make the entry point function calls consistent. NFC.
llvm-svn: 262191
-rw-r--r--lld/COFF/Driver.cpp5
-rw-r--r--lld/COFF/Driver.h2
-rw-r--r--lld/include/lld/Driver/Driver.h2
-rw-r--r--lld/tools/lld/lld.cpp9
4 files changed, 9 insertions, 9 deletions
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index 4cacf0ff552..2056484311d 100644
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -40,12 +40,13 @@ namespace coff {
Configuration *Config;
LinkerDriver *Driver;
-void link(llvm::ArrayRef<const char *> Args) {
+bool link(llvm::ArrayRef<const char *> Args) {
Configuration C;
LinkerDriver D;
Config = &C;
Driver = &D;
- return Driver->link(Args);
+ Driver->link(Args);
+ return true;
}
// Drop directory components and replace extension with ".exe".
diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h
index e50da20cbb0..208aad7f320 100644
--- a/lld/COFF/Driver.h
+++ b/lld/COFF/Driver.h
@@ -35,7 +35,7 @@ using llvm::Optional;
class InputFile;
// Entry point of the COFF linker.
-void link(llvm::ArrayRef<const char *> Args);
+bool link(llvm::ArrayRef<const char *> Args);
// Implemented in MarkLive.cpp.
void markLive(const std::vector<Chunk *> &Chunks);
diff --git a/lld/include/lld/Driver/Driver.h b/lld/include/lld/Driver/Driver.h
index 2c5b22b76ce..b990613cb76 100644
--- a/lld/include/lld/Driver/Driver.h
+++ b/lld/include/lld/Driver/Driver.h
@@ -71,7 +71,7 @@ private:
/// Driver for Windows 'link.exe' command line options
namespace coff {
-void link(llvm::ArrayRef<const char *> args);
+bool link(llvm::ArrayRef<const char *> args);
}
namespace elf {
diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
index 0ed9e5eabdb..01b0f32e368 100644
--- a/lld/tools/lld/lld.cpp
+++ b/lld/tools/lld/lld.cpp
@@ -113,14 +113,13 @@ int main(int Argc, const char **Argv) {
std::vector<const char *> Args(Argv, Argv + Argc);
switch (parseFlavor(Args)) {
case Gnu:
- return !elf::link(Args, errs());
+ return !elf::link(Args);
case WinLink:
- coff::link(Args);
- return 0;
+ return !coff::link(Args);
case Darwin:
- return !DarwinLdDriver::linkMachO(Args, errs());
+ return !DarwinLdDriver::linkMachO(Args);
case Core:
- return !CoreDriver::link(Args, errs());
+ return !CoreDriver::link(Args);
default:
die("-flavor option is missing. Available flavors are "
"gnu, darwin or link.");
OpenPOWER on IntegriCloud