[llvm-commits] CVS: llvm/tools/gccld/Linker.cpp

[Brian Gaeke]

Changes in directory llvm/tools/gccld:

Linker.cpp updated: 1.16 -> 1.17

---
Log message:

When we find a module we want, in an archive, in verbose mode,
 print out the module's identifier (which should now contain the name
 of both the archive and the module.)
Wrap some lines at 80 cols.



---
Diffs of the changes:  (+13 -6)

Index: llvm/tools/gccld/Linker.cpp
diff -u llvm/tools/gccld/Linker.cpp:1.16 llvm/tools/gccld/Linker.cpp:1.17
--- llvm/tools/gccld/Linker.cpp:1.16	Tue Nov 11 16:41:34 2003
+++ llvm/tools/gccld/Linker.cpp	Sun Nov 16 17:07:13 2003
@@ -205,7 +205,9 @@
              E = UndefinedSymbols.end(); I != E; ++I)
         if (DefSymbols.count(*I)) {
           if (Verbose)
-            std::cerr << "  Found object providing symbol '" << *I << "'...\n";
+            std::cerr << "  Found object '"
+                      << Objects[i]->getModuleIdentifier ()
+                      << "' providing symbol '" << *I << "'...\n";
           ObjectRequired = true;
           break;
         }
@@ -377,7 +379,8 @@
       // we're doing a native link and give an error if we're doing a bytecode
       // link.
       if (!Native) {
-        PrintAndReturn(progname, "Cannot find library -l" + Libraries[i] + "\n");
+        PrintAndReturn(progname, "Cannot find library -l" + Libraries[i]
+                       + "\n");
         return true;
       }
     }
@@ -386,20 +389,24 @@
     // is not installed as a library. Detect that and link the library.
     if (IsArchive(Pathname)) {
       if (Verbose)
-        std::cerr << "Trying to link archive '" << Pathname << "' (-l" << Libraries[i] << ")\n";
+        std::cerr << "Trying to link archive '" << Pathname << "' (-l"
+                  << Libraries[i] << ")\n";
 
       if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) {
         PrintAndReturn(progname, ErrorMessage,
-                       ": Error linking in archive '" + Pathname + "' (-l" + Libraries[i] + ")");
+                       ": Error linking in archive '" + Pathname
+                       + "' (-l" + Libraries[i] + ")");
         return true;
       }
     } else if (IsBytecode(Pathname)) {
       if (Verbose)
-        std::cerr << "Trying to link bytecode file '" << Pathname << "' (-l" << Libraries[i] << ")\n";
+        std::cerr << "Trying to link bytecode file '" << Pathname
+                  << "' (-l" << Libraries[i] << ")\n";
 
       if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) {
         PrintAndReturn(progname, ErrorMessage,
-                       ": error linking in bytecode file '" + Pathname + "' (-l" + Libraries[i] + ")");
+                       ": error linking in bytecode file '" + Pathname
+                       + "' (-l" + Libraries[i] + ")");
         return true;
       }
     }