Index: Common/ErrorHandler.cpp
===================================================================
--- Common/ErrorHandler.cpp
+++ Common/ErrorHandler.cpp
@@ -73,15 +73,37 @@
                   [&](ErrorInfoBase &EIB) { error(EIB.message()); });
 }
 
-void ErrorHandler::print(StringRef S, raw_ostream::Colors C) {
-  *ErrorOS << LogName << ": ";
-  if (ColorDiagnostics) {
-    ErrorOS->changeColor(C, true);
-    *ErrorOS << S;
-    ErrorOS->resetColor();
+void ErrorHandler::print(const Twine &Msg, const Twine &Origin,
+                         const Twine &LevelText,
+                         const raw_ostream::Colors Color) {
+  newline(ErrorOS, Msg);
+
+  // Visual Studio diagnostics must conform to several formatting rules that
+  // change the output from the default:
+  // - line/column information must be paranthesised.
+  // - Origin provides the source file and line information. While Origin can be
+  //   blank when source information is not available, we default to the lld
+  //   executable name without the path and '.exe. extensions. The current lld
+  //   behaviour is to use the full lld executable path, but visual studio
+  //   interprets this as a path to the source file.
+  // See
+  // https://blogs.msdn.microsoft.com/msbuild/2006/11/02/msbuild-visual-studio-aware-error-messages-and-message-formats/
+  if (VSDiagnostics) {
+    std::string OriginStr = (Origin.str().empty()) ? "lld" : Origin.str();
+    *ErrorOS << OriginStr << " : ";
   } else {
-    *ErrorOS << S;
+    *ErrorOS << LogName << " : ";
   }
+
+  if (ColorDiagnostics)
+    ErrorOS->changeColor(Color);
+
+  *ErrorOS << LevelText;
+
+  if (ColorDiagnostics)
+    ErrorOS->resetColor();
+
+  *ErrorOS << ": " << Msg << "\n";
 }
 
 void ErrorHandler::log(const Twine &Msg) {
@@ -97,27 +119,22 @@
   outs().flush();
 }
 
-void ErrorHandler::warn(const Twine &Msg) {
+void ErrorHandler::warn(const Twine &Msg, const Twine &Origin) {
   if (FatalWarnings) {
-    error(Msg);
+    error(Msg, Origin);
     return;
   }
 
   std::lock_guard<std::mutex> Lock(Mu);
-  newline(ErrorOS, Msg);
-  print("warning: ", raw_ostream::MAGENTA);
-  *ErrorOS << Msg << "\n";
+  print(Msg, Origin, "warning", raw_ostream::MAGENTA);
 }
 
-void ErrorHandler::error(const Twine &Msg) {
+void ErrorHandler::error(const Twine &Msg, const Twine &Origin) {
   std::lock_guard<std::mutex> Lock(Mu);
-  newline(ErrorOS, Msg);
 
   if (ErrorLimit == 0 || ErrorCount < ErrorLimit) {
-    print("error: ", raw_ostream::RED);
-    *ErrorOS << Msg << "\n";
+    print(Msg, Origin, "error", raw_ostream::RED);
   } else if (ErrorCount == ErrorLimit) {
-    print("error: ", raw_ostream::RED);
     *ErrorOS << ErrorLimitExceededMsg << "\n";
     if (ExitEarly)
       exitLld(1);
@@ -126,7 +143,7 @@
   ++ErrorCount;
 }
 
-void ErrorHandler::fatal(const Twine &Msg) {
-  error(Msg);
+void ErrorHandler::fatal(const Twine &Msg, const Twine &Origin) {
+  error(Msg, Origin);
   exitLld(1);
 }
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -73,7 +73,9 @@
 
 bool elf::link(ArrayRef<const char *> Args, bool CanExitEarly,
                raw_ostream &Error) {
-  errorHandler().LogName = Args[0];
+  errorHandler().LogName = errorHandler().VSDiagnostics
+                               ? sys::path::stem(sys::path::filename(Args[0]))
+                               : Args[0];
   errorHandler().ErrorLimitExceededMsg =
       "too many errors emitted, stopping now (use "
       "-error-limit=0 to see all errors)";
@@ -327,11 +329,13 @@
 
 void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
   ELFOptTable Parser;
-  opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
+  opt::InputArgList Args = Parser.parse(ArgsArr);
 
   // Interpret this flag early because error() depends on them.
   errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
 
+
+
   // Handle -help
   if (Args.hasArg(OPT_help)) {
     printHelp();
@@ -675,6 +679,9 @@
       Args.hasFlag(OPT_fatal_warnings, OPT_no_fatal_warnings, false);
   ThreadsEnabled = Args.hasFlag(OPT_threads, OPT_no_threads, true);
 
+  errorHandler().VSDiagnostics =
+      Args.hasArg(OPT_visual_studio_diagnostics_format);
+
   Config->AllowMultipleDefinition =
       Args.hasFlag(OPT_allow_multiple_definition,
                    OPT_no_allow_multiple_definition, false) ||
Index: ELF/DriverUtils.cpp
===================================================================
--- ELF/DriverUtils.cpp
+++ ELF/DriverUtils.cpp
@@ -123,6 +123,18 @@
   // --rsp-quoting.
   opt::InputArgList Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
 
+  // We need to set errorHandler.LogName, which is the diagnostic message
+  // prefix, before any calls to error() or warn(). Also strip the .exe
+  // extension as this can cause VS to interpret the filename as a source file
+  // and break VS compatibily
+  errorHandler().LogName = Args.hasArg(OPT_visual_studio_diagnostics_format)
+                               ? sys::path::stem(sys::path::filename(Argv[0]))
+                               : Argv[0];
+
+  // remove executable name from the argument vectorso it is not later
+  // interpreted as an input object file
+  Vec.erase(Vec.begin());
+
   // Expand response files (arguments in the form of @<filename>)
   // and then parse the argument again.
   cl::ExpandResponseFiles(Saver, getQuotingStyle(Args), Vec);
@@ -130,6 +142,7 @@
   Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
 
   handleColorDiagnostics(Args);
+
   if (MissingCount)
     error(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
 
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -81,11 +81,17 @@
 
 // Concatenates arguments to construct a string representing an error location.
 static std::string createFileLineMsg(StringRef Path, unsigned Line) {
-  std::string Filename = path::filename(Path);
-  std::string Lineno = ":" + std::to_string(Line);
-  if (Filename == Path)
-    return Filename + Lineno;
-  return Filename + Lineno + " (" + Path.str() + Lineno + ")";
+  // Visual Studio diagnostics format stipulates paranthesised line and
+  // column information.
+  if (errorHandler().VSDiagnostics) {
+    return Path.str() + " " + "(" + std::to_string(Line) + ")";
+  } else {
+    std::string Filename = path::filename(Path);
+    std::string Lineno = ":" + std::to_string(Line);
+    if (Filename == Path)
+      return Filename + Lineno;
+    return Filename + Lineno + " (" + Path.str() + Lineno + ")";
+  }
 }
 
 template <class ELFT>
Index: ELF/Options.td
===================================================================
--- ELF/Options.td
+++ ELF/Options.td
@@ -359,6 +359,9 @@
 def z: JoinedOrSeparate<["-"], "z">, MetaVarName<"<option>">,
   HelpText<"Linker option extensions">;
 
+def visual_studio_diagnostics_format : F<"vs-diagnostics">,
+  HelpText<"Format diagnostics for Visual Studio compatiblity">;
+
 // Aliases
 def alias_auxiliary: Separate<["-"], "f">, Alias<auxiliary>;
 def alias_Bdynamic_call_shared: F<"call_shared">, Alias<Bdynamic>;
Index: ELF/Relocations.cpp
===================================================================
--- ELF/Relocations.cpp
+++ ELF/Relocations.cpp
@@ -635,11 +635,11 @@
 
   if ((Config->UnresolvedSymbols == UnresolvedPolicy::Warn && CanBeExternal) ||
       Config->NoinhibitExec) {
-    warn(Msg);
+    warn(Msg, Src);
     return false;
   }
 
-  error(Msg);
+  error(Msg, Src);
   return true;
 }
 
Index: include/lld/Common/ErrorHandler.h
===================================================================
--- include/lld/Common/ErrorHandler.h
+++ include/lld/Common/ErrorHandler.h
@@ -51,29 +51,36 @@
   bool ExitEarly = true;
   bool FatalWarnings = false;
   bool Verbose = false;
+  bool VSDiagnostics = false;
 
-  void error(const Twine &Msg);
-  LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg);
+  void error(const Twine &Msg, const Twine &Origin);
+  LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg, const Twine &Origin);
   void log(const Twine &Msg);
   void message(const Twine &Msg);
-  void warn(const Twine &Msg);
+  void warn(const Twine &Msg, const Twine &Origin);
 
   std::unique_ptr<llvm::FileOutputBuffer> OutputBuffer;
 
 private:
-  void print(StringRef S, raw_ostream::Colors C);
+    void print(const Twine &Msg, const Twine &Origin, const Twine &LevelText,
+        const raw_ostream::Colors Color);
 };
 
 /// Returns the default error handler.
 ErrorHandler &errorHandler();
 
-inline void error(const Twine &Msg) { errorHandler().error(Msg); }
-inline LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg) {
-  errorHandler().fatal(Msg);
+inline void error(const Twine &Msg, const Twine &Origin = "") {
+  errorHandler().error(Msg, Origin);
+}
+inline LLVM_ATTRIBUTE_NORETURN void fatal(const Twine &Msg,
+                                          const Twine &Origin = "") {
+  errorHandler().fatal(Msg, Origin);
 }
 inline void log(const Twine &Msg) { errorHandler().log(Msg); }
 inline void message(const Twine &Msg) { errorHandler().message(Msg); }
-inline void warn(const Twine &Msg) { errorHandler().warn(Msg); }
+inline void warn(const Twine &Msg, const Twine &Origin = "") {
+  errorHandler().warn(Msg, Origin);
+}
 inline uint64_t errorCount() { return errorHandler().ErrorCount; }
 
 LLVM_ATTRIBUTE_NORETURN void exitLld(int Val);
Index: test/ELF/vs-diagnostics.s
===================================================================
--- /dev/null
+++ test/ELF/vs-diagnostics.s
@@ -0,0 +1,25 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: not ld.lld --vs-diagnostics %t.o 2>&1 | \
+# RUN:   FileCheck -check-prefix=CHECKERR %s
+# RUN: not ld.lld --nonexistantflag --vs-diagnostics %t.o 2>&1 | \
+# RUN:   FileCheck -check-prefix=CHECKFLAG %s
+
+## Check that the undefined symbols and sources are reported correctly
+## for a call to error() with a source parameter
+# CHECKERR: undef.s : error: undefined symbol: flump
+# CHECKERR-NEXT: >>> referenced by undef.s
+# CHECKERR-NEXT: >>>               {{.*}}vs-diagnostics.s.tmp.o:(.text+0x1)
+# CHECKERR-EMPTY:
+# CHECKERR: undef.s : error: undefined symbol: foo
+# CHECKERR-NEXT: >>> referenced by undef.s
+# CHECKERR-NEXT: >>>               {{.*}}vs-diagnostics.s.tmp.o:(.text+0x6)
+
+## Check that we have configured the diagnostic prefix early enough
+## so output is VS conformant when reporting an unknown argument
+# CHECKFLAG: ld.lld : error: unknown argument: --nonexistantflag
+
+.file "undef.s"
+  .globl _start
+  call flump
+  call foo