6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-01 01:30:36 +00:00
Code Issues Projects Releases Wiki Activity

Modified the linker so that it always links in an object from an archive

Browse Source 
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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10594 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
John Criswell 2003-12-23 17:37:06 +00:00
parent ac1ccae982
commit 1715ce00e4
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Linker/LinkArchives.cpp
View File

@ -200,17 +200,27 @@ static bool LinkInArchive(Module *M,
const std::set<std::string> &DefSymbols = DefinedSymbols[i]; const std::set<std::string> &DefSymbols = DefinedSymbols[i];
bool ObjectRequired = false; bool ObjectRequired = false;
for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
E = UndefinedSymbols.end(); I != E; ++I) //
if (DefSymbols.count(*I)) { // If the object defines main(), then it is automatically required.
if (Verbose) // Otherwise, look to see if it defines a symbol that is currently
std::cerr << " Found object '" // undefined.
<< Objects[i]->getModuleIdentifier () //
<< "' providing symbol '" << *I << "'...\n"; if ((DefSymbols.find ("main")) == DefSymbols.end()) {
ObjectRequired = true; for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
break; 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... // We DO need to link this object into the program...
if (ObjectRequired) { if (ObjectRequired) {
if (LinkModules(M, Objects[i], &ErrorMessage)) if (LinkModules(M, Objects[i], &ErrorMessage))

32
tools/gccld/Linker.cpp
View File

@ -200,17 +200,27 @@ static bool LinkInArchive(Module *M,
const std::set<std::string> &DefSymbols = DefinedSymbols[i]; const std::set<std::string> &DefSymbols = DefinedSymbols[i];
bool ObjectRequired = false; bool ObjectRequired = false;
for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
E = UndefinedSymbols.end(); I != E; ++I) //
if (DefSymbols.count(*I)) { // If the object defines main(), then it is automatically required.
if (Verbose) // Otherwise, look to see if it defines a symbol that is currently
std::cerr << " Found object '" // undefined.
<< Objects[i]->getModuleIdentifier () //
<< "' providing symbol '" << *I << "'...\n"; if ((DefSymbols.find ("main")) == DefSymbols.end()) {
ObjectRequired = true; for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
break; 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... // We DO need to link this object into the program...
if (ObjectRequired) { if (ObjectRequired) {
if (LinkModules(M, Objects[i], &ErrorMessage)) if (LinkModules(M, Objects[i], &ErrorMessage))