forked from OSchip/llvm-project
Modified the linker so that it always links in an object from an archive
that defines the symbol "main." This is a hack that ensures that programs that place their main function in a library and then link it in (i.e. Apache 2.x) get their main function linked in. There is probably a more correct way to do this, but this works for now. llvm-svn: 10594
This commit is contained in:
parent
bd03ac8567
commit
b6d3cb9449
|
@ -200,17 +200,27 @@ static bool LinkInArchive(Module *M,
|
|||
const std::set<std::string> &DefSymbols = DefinedSymbols[i];
|
||||
|
||||
bool ObjectRequired = false;
|
||||
for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
|
||||
E = UndefinedSymbols.end(); I != E; ++I)
|
||||
if (DefSymbols.count(*I)) {
|
||||
if (Verbose)
|
||||
std::cerr << " Found object '"
|
||||
<< Objects[i]->getModuleIdentifier ()
|
||||
<< "' providing symbol '" << *I << "'...\n";
|
||||
ObjectRequired = true;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// If the object defines main(), then it is automatically required.
|
||||
// Otherwise, look to see if it defines a symbol that is currently
|
||||
// undefined.
|
||||
//
|
||||
if ((DefSymbols.find ("main")) == DefSymbols.end()) {
|
||||
for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
|
||||
E = UndefinedSymbols.end(); I != E; ++I)
|
||||
if (DefSymbols.count(*I)) {
|
||||
if (Verbose)
|
||||
std::cerr << " Found object '"
|
||||
<< Objects[i]->getModuleIdentifier ()
|
||||
<< "' providing symbol '" << *I << "'...\n";
|
||||
ObjectRequired = true;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
ObjectRequired = true;
|
||||
}
|
||||
|
||||
// We DO need to link this object into the program...
|
||||
if (ObjectRequired) {
|
||||
if (LinkModules(M, Objects[i], &ErrorMessage))
|
||||
|
|
Loading…
Reference in New Issue