[llvm-commits] CVS: llvm/lib/Linker/LinkArchives.cpp

[Chris Lattner]

Changes in directory llvm/lib/Linker:

LinkArchives.cpp updated: 1.47 -> 1.48
---
Log message:

fix some 80 column violations
Add support for programs that define main in a .a file, such as f2c'd programs.


---
Diffs of the changes:  (+11 -4)

 LinkArchives.cpp |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


Index: llvm/lib/Linker/LinkArchives.cpp
diff -u llvm/lib/Linker/LinkArchives.cpp:1.47 llvm/lib/Linker/LinkArchives.cpp:1.48
--- llvm/lib/Linker/LinkArchives.cpp:1.47	Mon Mar 14 22:54:19 2005
+++ llvm/lib/Linker/LinkArchives.cpp	Tue Mar 15 17:03:34 2005
@@ -21,8 +21,6 @@
 #include "llvm/Config/config.h"
 #include <memory>
 #include <set>
-#include <iostream>
-
 using namespace llvm;
 
 /// GetAllDefinedSymbols - Modifies its parameter DefinedSymbols to contain the
@@ -33,7 +31,8 @@
   for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
     if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage())
       DefinedSymbols.insert(I->getName());
-  for (Module::global_iterator I = M->global_begin(), E = M->global_end(); I != E; ++I)
+  for (Module::global_iterator I = M->global_begin(), E = M->global_end();
+       I != E; ++I)
     if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage())
       DefinedSymbols.insert(I->getName());
 }
@@ -54,6 +53,13 @@
 GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
   std::set<std::string> DefinedSymbols;
   UndefinedSymbols.clear();
+
+  // If the program doesn't define a main, try pulling one in from a .a file.
+  // This is needed for programs where the main function is defined in an
+  // archive, such f2c'd programs.
+  Function *Main = M->getMainFunction();
+  if (Main == 0 || Main->isExternal())
+    UndefinedSymbols.insert("main");
   
   for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
     if (I->hasName()) {
@@ -62,7 +68,8 @@
       else if (!I->hasInternalLinkage())
         DefinedSymbols.insert(I->getName());
     }
-  for (Module::global_iterator I = M->global_begin(), E = M->global_end(); I != E; ++I)
+  for (Module::global_iterator I = M->global_begin(), E = M->global_end();
+       I != E; ++I)
     if (I->hasName()) {
       if (I->isExternal())
         UndefinedSymbols.insert(I->getName());