[llvm] Revert "Remove unnecessary newline from error message" (PR #120037)

[Shao-Ce SUN via llvm-commits]

https://github.com/sunshaoce updated https://github.com/llvm/llvm-project/pull/120037

>From aca5a0d409fb75baa9706c17aae9f04fd6bd7931 Mon Sep 17 00:00:00 2001
From: Shao-Ce SUN <sunshaoce at outlook.com>
Date: Mon, 16 Dec 2024 16:51:38 +0800
Subject: [PATCH] [LLVM][tools] Remove unnecessary newline from error message

---
 llvm/lib/MC/TargetRegistry.cpp        | 2 +-
 llvm/test/tools/llc/invalid-target.ll | 7 +++++--
 llvm/tools/llc/llc.cpp                | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/llvm/lib/MC/TargetRegistry.cpp b/llvm/lib/MC/TargetRegistry.cpp
index 3be6f1d4634990..e1879f97aa5675 100644
--- a/llvm/lib/MC/TargetRegistry.cpp
+++ b/llvm/lib/MC/TargetRegistry.cpp
@@ -126,7 +126,7 @@ const Target *TargetRegistry::lookupTarget(StringRef ArchName,
                      [&](const Target &T) { return ArchName == T.getName(); });
 
     if (I == targets().end()) {
-      Error = ("invalid target '" + ArchName + "'.\n").str();
+      Error = ("invalid target '" + ArchName + "'.").str();
       return nullptr;
     }
 
diff --git a/llvm/test/tools/llc/invalid-target.ll b/llvm/test/tools/llc/invalid-target.ll
index 6eed627b0115d9..7cbb171c7225e1 100644
--- a/llvm/test/tools/llc/invalid-target.ll
+++ b/llvm/test/tools/llc/invalid-target.ll
@@ -3,8 +3,11 @@
 
 ; Check the error message doesn't say error twice.
 
-; MARCH: {{.*}}llc{{.*}}: error: invalid target 'arst'.{{$}}
-; MTRIPLE: {{.*}}llc{{.*}}: error: unable to get target for 'arst-unknown-unknown', see --version and --triple.{{$}}
+; MARCH: {{.*}}llc{{.*}}: error: invalid target 'arst'.
+; MARCH-EMPTY:
+;
+; MTRIPLE: {{.*}}llc{{.*}}: error: unable to get target for 'arst-unknown-unknown', see --version and --triple.
+; MTRIPLE-EMPTY:
 
 define void @func() {
   ret void
diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 150dd50ef2936e..3694ff79b54364 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -549,7 +549,7 @@ static int compileModule(char **argv, LLVMContext &Context) {
       TheTarget =
           TargetRegistry::lookupTarget(codegen::getMArch(), TheTriple, Error);
       if (!TheTarget) {
-        WithColor::error(errs(), argv[0]) << Error;
+        WithColor::error(errs(), argv[0]) << Error << "\n";
         exit(1);
       }
 
@@ -592,7 +592,7 @@ static int compileModule(char **argv, LLVMContext &Context) {
     TheTarget =
         TargetRegistry::lookupTarget(codegen::getMArch(), TheTriple, Error);
     if (!TheTarget) {
-      WithColor::error(errs(), argv[0]) << Error;
+      WithColor::error(errs(), argv[0]) << Error << "\n";
       return 1;
     }