diff options
Diffstat (limited to 'lld/lib/Driver/DarwinLdDriver.cpp')
-rw-r--r-- | lld/lib/Driver/DarwinLdDriver.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp index f0cb513813d..8646d86c08e 100644 --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -333,8 +333,8 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) { Twine(unknownArg->getAsString(parsedArgs))); } - errorHandler().Verbose = parsedArgs.hasArg(OPT_v); - errorHandler().ErrorLimit = args::getInteger(parsedArgs, OPT_error_limit, 20); + errorHandler().verbose = parsedArgs.hasArg(OPT_v); + errorHandler().errorLimit = args::getInteger(parsedArgs, OPT_error_limit, 20); // Figure out output kind ( -dylib, -r, -bundle, -preload, or -static ) llvm::MachO::HeaderFileType fileType = llvm::MachO::MH_EXECUTE; @@ -637,7 +637,7 @@ bool parse(llvm::ArrayRef<const char *> args, MachOLinkingContext &ctx) { // Now that we've constructed the final set of search paths, print out those // search paths in verbose mode. - if (errorHandler().Verbose) { + if (errorHandler().verbose) { message("Library search paths:"); for (auto path : ctx.searchDirs()) { message(" " + path); @@ -1145,13 +1145,13 @@ static void createFiles(MachOLinkingContext &ctx, bool Implicit) { /// This is where the link is actually performed. bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly, raw_ostream &Error) { - errorHandler().LogName = args::getFilenameWithoutExe(args[0]); - errorHandler().ErrorLimitExceededMsg = + errorHandler().logName = args::getFilenameWithoutExe(args[0]); + errorHandler().errorLimitExceededMsg = "too many errors emitted, stopping now (use " "'-error-limit 0' to see all errors)"; - errorHandler().ErrorOS = &Error; - errorHandler().ExitEarly = CanExitEarly; - errorHandler().ColorDiagnostics = Error.has_colors(); + errorHandler().errorOS = &Error; + errorHandler().exitEarly = CanExitEarly; + errorHandler().colorDiagnostics = Error.has_colors(); MachOLinkingContext ctx; if (!parse(args, ctx)) @@ -1196,9 +1196,9 @@ bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly, if (auto ec = pm.runOnFile(*merged)) { // FIXME: This should be passed to logAllUnhandledErrors but it needs // to be passed a Twine instead of a string. - *errorHandler().ErrorOS << "Failed to run passes on file '" + *errorHandler().errorOS << "Failed to run passes on file '" << ctx.outputPath() << "': "; - logAllUnhandledErrors(std::move(ec), *errorHandler().ErrorOS, + logAllUnhandledErrors(std::move(ec), *errorHandler().errorOS, std::string()); return false; } @@ -1210,9 +1210,9 @@ bool link(llvm::ArrayRef<const char *> args, bool CanExitEarly, if (auto ec = ctx.writeFile(*merged)) { // FIXME: This should be passed to logAllUnhandledErrors but it needs // to be passed a Twine instead of a string. - *errorHandler().ErrorOS << "Failed to write file '" << ctx.outputPath() + *errorHandler().errorOS << "Failed to write file '" << ctx.outputPath() << "': "; - logAllUnhandledErrors(std::move(ec), *errorHandler().ErrorOS, + logAllUnhandledErrors(std::move(ec), *errorHandler().errorOS, std::string()); return false; } |