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()) ? LogName.str() : 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.h
===================================================================
--- ELF/Driver.h
+++ ELF/Driver.h
@@ -52,7 +52,8 @@
 class ELFOptTable : public llvm::opt::OptTable {
 public:
   ELFOptTable();
-  llvm::opt::InputArgList parse(ArrayRef<const char *> Argv);
+  llvm::opt::InputArgList parse(StringRef linkerExeName,
+                                ArrayRef<const char *> Argv);
 };
 
 // Create enum with OPT_xxx values for each option in Options.td
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -327,7 +327,10 @@
 
 void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
   ELFOptTable Parser;
-  opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
+
+  // Extract the executable name for diagnostic print outs
+  StringRef linkerExecutableName = ArgsArr[0];
+  opt::InputArgList Args = Parser.parse(linkerExecutableName, ArgsArr.slice(1));
 
   // Interpret this flag early because error() depends on them.
   errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
Index: ELF/DriverUtils.cpp
===================================================================
--- ELF/DriverUtils.cpp
+++ ELF/DriverUtils.cpp
@@ -112,7 +112,8 @@
 }
 
 // Parses a given list of options.
-opt::InputArgList ELFOptTable::parse(ArrayRef<const char *> Argv) {
+opt::InputArgList ELFOptTable::parse(StringRef linkerExeName,
+                                     ArrayRef<const char *> Argv) {
   // Make InputArgList from string vectors.
   unsigned MissingIndex;
   unsigned MissingCount;
@@ -129,7 +130,16 @@
   concatLTOPluginOptions(Vec);
   Args = this->ParseArgs(Vec, MissingIndex, MissingCount);
 
+  errorHandler().VSDiagnostics =
+      Args.hasArg(OPT_visual_studio_diagnostics_format);
+
+  // We need to set a Visual Studio compatible errorHandler.LogName, 
+  //which is the diagnostic message prefix, before any calls to error() or warn().
+  if (errorHandler().VSDiagnostics)
+    errorHandler().LogName = sys::path::stem(sys::path::filename(linkerExeName));
+
   handleColorDiagnostics(Args);
+
   if (MissingCount)
     error(Twine(Args.getArgString(MissingIndex)) + ": missing argument");
 
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -81,6 +81,11 @@
 
 // Concatenates arguments to construct a string representing an error location.
 static std::string createFileLineMsg(StringRef Path, unsigned Line) {
+  // Visual Studio diagnostics format stipulates paranthesised line and
+  // column information.
+  if (errorHandler().VSDiagnostics)
+    return Path.str() + " " + "(" + std::to_string(Line) + ")";
+
   std::string Filename = path::filename(Path);
   std::string Lineno = ":" + std::to_string(Line);
   if (Filename == Path)
Index: ELF/Options.td
===================================================================
--- ELF/Options.td
+++ ELF/Options.td
@@ -355,6 +355,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: Separate<["-"], "f">, Alias<auxiliary>, HelpText<"Alias for --auxiliary">;
 def: F<"call_shared">, Alias<Bdynamic>, HelpText<"Alias for --Bdynamic">;
Index: ELF/Relocations.cpp
===================================================================
--- ELF/Relocations.cpp
+++ ELF/Relocations.cpp
@@ -624,11 +624,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
@@ -92,29 +92,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/Inputs/vs-diagnostics-multiply-defined.s
===================================================================
--- /dev/null
+++ test/ELF/Inputs/vs-diagnostics-multiply-defined.s
@@ -0,0 +1,3 @@
+.file "vs-diagnostics-multiply-defined.s"
+.globl wump
+wump:
Index: test/ELF/vs-diagnostics.s
===================================================================
--- /dev/null
+++ test/ELF/vs-diagnostics.s
@@ -0,0 +1,110 @@
+## We repeat all tests with and without the vs-diagnostics flag enabled
+## to demonstrate the output differences.
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/vs-diagnostics-multiply-defined.s -o %t2.o
+
+## Check error message output when source information is provided.
+
+## Without --vs-diagnostics:
+# RUN: not ld.lld %t.o 2>&1 | \
+# RUN:   FileCheck --strict-whitespace -check-prefix=SOURCE -D=PATH=%T %s
+
+# SOURCE: {{.+}}ld.lld{{(.EXE|.exe)?}} : error: undefined symbol: flump
+# SOURCE-NEXT: >>> referenced by vs-diagnostics.s:1215
+# SOURCE-NEXT: >>>               [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp.o:(.text+0x1){{$}}
+# SOURCE-SAME: {{[[:space:]]$}}
+# SOURCE-NEXT: {{.+}}ld.lld{{(.EXE|.exe)?}} : error: undefined symbol: foo
+# SOURCE-NEXT: >>> referenced by vs-diagnostics.s:1066
+# SOURCE-NEXT: >>>               [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp.o:(.text+0x6)
+
+## With --vs-diagnostics:
+# RUN: not ld.lld --vs-diagnostics %t.o 2>&1 | \
+# RUN:   FileCheck --strict-whitespace -check-prefix=VSSOURCE -D=PATH=%T %s
+
+# VSSOURCE: vs-diagnostics.s (1215) : error: undefined symbol: flump
+# VSSOURCE-NEXT: >>> referenced by vs-diagnostics.s
+# VSSOURCE-NEXT: >>>               [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp.o:(.text+0x1){{$}}
+# VSSOURCE-SAME: {{[[:space:]]$}}
+# VSSOURCE-NEXT: vs-diagnostics.s (1066) : error: undefined symbol: foo
+# VSSOURCE-NEXT: >>> referenced by vs-diagnostics.s
+# VSSOURCE-NEXT: >>>               [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp.o:(.text+0x6)
+
+## Check error message output when no source information is provided.
+
+## Without --vs-diagnostics:
+# RUN: not ld.lld %t2.o %t2.o 2>&1 | \
+# RUN:   FileCheck --strict-whitespace -check-prefix=NOSOURCE -D=PATH=%T %s
+
+# NOSOURCE: {{.+}}ld.lld{{(.EXE|.exe)?}} : error: duplicate symbol: wump
+# NOSOURCE-NEXT: >>> defined at vs-diagnostics-multiply-defined.s
+# NOSOURCE-NEXT: >>>            [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp2.o:(.text+0x0)
+# NOSOURCE-NEXT: >>> defined at vs-diagnostics-multiply-defined.s
+# NOSOURCE-NEXT: >>>            [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp2.o:(.text+0x0)
+
+## With --vs-diagnostics:
+# RUN: not ld.lld --vs-diagnostics %t2.o %t2.o 2>&1 | \ 
+# RUN:   FileCheck --strict-whitespace -check-prefix=VSNOSOURCE -D=PATH=%T %s
+
+# VSNOSOURCE: ld.lld : error: duplicate symbol: wump
+# VSNOSOURCE-NEXT: >>> defined at vs-diagnostics-multiply-defined.s
+# VSNOSOURCE-NEXT: >>>            [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp2.o:(.text+0x0)
+# VSNOSOURCE-NEXT: >>> defined at vs-diagnostics-multiply-defined.s
+# VSNOSOURCE-NEXT: >>>            [[PATH]]{{\\|\/}}vs-diagnostics.s.tmp2.o:(.text+0x0)
+
+## Check that we have configured the diagnostic prefix early enough
+## so that the output is VS conformant when reporting an unknown command line
+## argument.
+
+## Without --vs-diagnostics:
+# RUN: not ld.lld --nonexistantflag %t.o 2>&1 | \
+# RUN: FileCheck -check-prefix=EARLY %s
+
+# EARLY: {{.+}}ld.lld{{(.EXE|.exe)?}} : error: unknown argument: --nonexistantflag
+
+## With -- vs-diagnostics:
+# RUN: not ld.lld --nonexistantflag --vs-diagnostics %t.o 2>&1 | \
+# RUN:   FileCheck -check-prefix=VSEARLY %s
+
+# VSEARLY: ld.lld : error: unknown argument: --nonexistantflag
+
+.file 1 "vs-diagnostics.s"
+.text
+  .globl _start
+_start:
+  .loc 1 1215
+  call flump
+  .loc 1 1066
+  call foo
+end_start:
+
+.section  .debug_abbrev,"",@progbits
+.byte  1  # Abbreviation Code
+.byte  17 # DW_TAG_compile_unit
+.byte  0  # DW_CHILDREN_no
+.byte 16  # DW_AT_stmt_list
+.byte 23  # DW_FORM_sec_offset
+.byte 17  # DW_AT_low_pc
+.byte 1   # DW_FORM_addr
+.byte 18  # DW_AT_high_pc
+.byte 6   # DW_FORM_data4
+.byte 0   # EOM(1)
+.byte 0   # EOM(2)
+.byte 0   # EOM(3)
+
+.section .debug_info,"",@progbits
+.long  .end_debug_info - .start_debug_info # Length of Unit
+.start_debug_info:
+.short  4                      # DWARF version number
+.long  .debug_abbrev           # Offset Into Abbrev. Section
+.byte  8                       # Address Size (in bytes)
+.byte  1                       # Abbrev [1] 0xb:0x19 DW_TAG_compile_unit
+.long .Lline_table_start0      # DW_AT_stmt_list
+.quad _start
+.long end_start - _start
+.end_debug_info:
+
+.section	.debug_line,"",@progbits
+
+.Lline_table_start0: