From 608e75c604a0454f51d514e23b3d70254b832a10 Mon Sep 17 00:00:00 2001
From: Brian Gaeke <gaeke@uiuc.edu>
Date: Wed, 8 Oct 2003 19:09:30 +0000
Subject: [PATCH] Make more error messages have gccld's name in them. Add a
 newline after "Cannot find <library>".

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8968 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Linker/LinkArchives.cpp | 10 ++++++----
 tools/gccld/Linker.cpp      | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index 034a552aba6..5989925d04a 100644
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -354,13 +354,15 @@ bool LinkFiles(const char *progname,
       Pathname = Files[i];
     } else {
       if (SearchPath == NULL) {
-        std::cerr << "Cannot find linker input file '" << Files[i] << "'";
+        std::cerr << progname << ": Cannot find linker input file '"
+                  << Files[i] << "'\n";
         return true;
       }
 
       Pathname = std::string(SearchPath)+"/"+Files[i];
       if (!FileExists(Pathname)) {
-        std::cerr << "Cannot find linker input file '" << Files[i] << "'";
+        std::cerr << progname << ": Cannot find linker input file '"
+                  << Files[i] << "'\n";
         return true;
       }
     }
@@ -382,7 +384,7 @@ bool LinkFiles(const char *progname,
 
       if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
         PrintAndReturn(progname, ErrorMessage,
-                       ": error linking in '" + Files[i] + "'");
+                       ": Error linking in '" + Files[i] + "'");
         return true;
       }
     }
@@ -427,7 +429,7 @@ bool LinkLibraries(const char *progname,
       // we're doing a native link and give an error if we're doing a bytecode
       // link.
       if (!Native) {
-        PrintAndReturn(progname, "Cannot find " + Libraries[i]);
+        PrintAndReturn(progname, "Cannot find " + Libraries[i] + "\n");
         return true;
       }
     }
diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp
index 034a552aba6..5989925d04a 100644
--- a/tools/gccld/Linker.cpp
+++ b/tools/gccld/Linker.cpp
@@ -354,13 +354,15 @@ bool LinkFiles(const char *progname,
       Pathname = Files[i];
     } else {
       if (SearchPath == NULL) {
-        std::cerr << "Cannot find linker input file '" << Files[i] << "'";
+        std::cerr << progname << ": Cannot find linker input file '"
+                  << Files[i] << "'\n";
         return true;
       }
 
       Pathname = std::string(SearchPath)+"/"+Files[i];
       if (!FileExists(Pathname)) {
-        std::cerr << "Cannot find linker input file '" << Files[i] << "'";
+        std::cerr << progname << ": Cannot find linker input file '"
+                  << Files[i] << "'\n";
         return true;
       }
     }
@@ -382,7 +384,7 @@ bool LinkFiles(const char *progname,
 
       if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
         PrintAndReturn(progname, ErrorMessage,
-                       ": error linking in '" + Files[i] + "'");
+                       ": Error linking in '" + Files[i] + "'");
         return true;
       }
     }
@@ -427,7 +429,7 @@ bool LinkLibraries(const char *progname,
       // we're doing a native link and give an error if we're doing a bytecode
       // link.
       if (!Native) {
-        PrintAndReturn(progname, "Cannot find " + Libraries[i]);
+        PrintAndReturn(progname, "Cannot find " + Libraries[i] + "\n");
         return true;
       }
     }