maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 10039
This commit is contained in:
Brian Gaeke 2003-11-16 23:07:13 +00:00
parent 00211f1d80
commit 7ff0d09adc
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/tools/gccld/Linker.cpp
View File

@ -205,7 +205,9 @@ static bool LinkInArchive(Module *M,
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 @@ 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 library -l" + Libraries[i] + "\n");
PrintAndReturn(progname, "Cannot find library -l" + Libraries[i]
+ "\n");
return true;
}
}
@ -386,20 +389,24 @@ bool LinkLibraries(const char *progname,
// 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;
}
}