diff --git a/lld/COFF/Driver.h b/lld/COFF/Driver.h --- a/lld/COFF/Driver.h +++ b/lld/COFF/Driver.h @@ -78,7 +78,7 @@ class LinkerDriver { public: - void link(llvm::ArrayRef args); + void linkerMain(llvm::ArrayRef args); // Used by the resolver to parse .drectve section contents. void parseDirectives(InputFile *file); diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -78,7 +78,7 @@ symtab = make(); driver = make(); - driver->link(args); + driver->linkerMain(args); // Call exit() if we can to avoid calling destructors. if (canExitEarly) @@ -1107,7 +1107,7 @@ return None; } -void LinkerDriver::link(ArrayRef argsArr) { +void LinkerDriver::linkerMain(ArrayRef argsArr) { ScopedTimer rootTimer(Timer::root()); // Needed for LTO. diff --git a/lld/ELF/Driver.h b/lld/ELF/Driver.h --- a/lld/ELF/Driver.h +++ b/lld/ELF/Driver.h @@ -26,7 +26,7 @@ class LinkerDriver { public: - void main(ArrayRef args); + void linkerMain(ArrayRef args); void addFile(StringRef path, bool withLOption); void addLibrary(StringRef name); diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -111,7 +111,7 @@ config->progName = args[0]; - driver->main(args); + driver->linkerMain(args); // Exit immediately if we don't need to return to the caller. // This saves time because the overhead of calling destructors @@ -454,7 +454,7 @@ error("unknown -z value: " + StringRef(arg->getValue())); } -void LinkerDriver::main(ArrayRef argsArr) { +void LinkerDriver::linkerMain(ArrayRef argsArr) { ELFOptTable parser; opt::InputArgList args = parser.parse(argsArr.slice(1)); diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp --- a/lld/wasm/Driver.cpp +++ b/lld/wasm/Driver.cpp @@ -66,7 +66,7 @@ class LinkerDriver { public: - void link(ArrayRef argsArr); + void linkerMain(ArrayRef argsArr); private: void createFiles(opt::InputArgList &args); @@ -95,7 +95,7 @@ symtab = make(); initLLVM(); - LinkerDriver().link(args); + LinkerDriver().linkerMain(args); // Exit immediately if we don't need to return to the caller. // This saves time because the overhead of calling destructors @@ -735,7 +735,7 @@ symtab->wrap(w.sym, w.real, w.wrap); } -void LinkerDriver::link(ArrayRef argsArr) { +void LinkerDriver::linkerMain(ArrayRef argsArr) { WasmOptTable parser; opt::InputArgList args = parser.parse(argsArr.slice(1));