From a217d2f61802afda5b5fcf360e8dd1a298cb998c Mon Sep 17 00:00:00 2001
From: Yunzhong Gao <Yunzhong_Gao@playstation.sony.com>
Date: Tue, 10 Nov 2015 18:52:48 +0000
Subject: [PATCH] llvm-lto: trivial spelling changes to distinguish custom
 diagnostic handler and default diagnostic handler.

Differential Revision: http://reviews.llvm.org/D14520

llvm-svn: 252633
---
 test/LTO/X86/diagnostic-handler-remarks.ll | 4 +++-
 tools/llvm-lto/llvm-lto.cpp                | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/LTO/X86/diagnostic-handler-remarks.ll b/test/LTO/X86/diagnostic-handler-remarks.ll
index 4da9101117e..690a9014a7e 100644
--- a/test/LTO/X86/diagnostic-handler-remarks.ll
+++ b/test/LTO/X86/diagnostic-handler-remarks.ll
@@ -9,7 +9,7 @@
 
 ; RUN: llvm-lto -pass-remarks=inline -use-diagnostic-handler \
 ; RUN:         -exported-symbol _main -o %t.o %t.bc 2>&1 | \
-; RUN:     FileCheck %s -allow-empty -check-prefix=REMARKS
+; RUN:     FileCheck %s -allow-empty -check-prefix=REMARKS_DH
 ; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM
 
 ; Confirm that -pass-remarks are not printed by default.
@@ -24,7 +24,9 @@
 ; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM
 
 ; REMARKS: remark:
+; REMARKS_DH: llvm-lto: remark:
 ; CHECK-NOT: remark:
+; CHECK-NOT: llvm-lto:
 ; NM-NOT: foo
 ; NM: main
 
diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp
index cdfe97f4907..04050c54870 100644
--- a/tools/llvm-lto/llvm-lto.cpp
+++ b/tools/llvm-lto/llvm-lto.cpp
@@ -101,6 +101,7 @@ struct ModuleInfo {
 
 static void handleDiagnostics(lto_codegen_diagnostic_severity_t Severity,
                               const char *Msg, void *) {
+  errs() << "llvm-lto: ";
   switch (Severity) {
   case LTO_DS_NOTE:
     errs() << "note: ";