Fine tune Visual Studio's use of bison/flex.

[oota-llvm.git] / lib / Linker / LinkArchives.cpp

diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index 2f6cfca33229e55fbd928bb7185327dad190d8a5..5165bad1991fbbe6ec6256ad5ac68bcdd67d1cdf 100644 (file)
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -1,10 +1,10 @@
 //===- lib/Linker/LinkArchives.cpp - Link LLVM objects and libraries ------===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // This file contains routines to handle linking together LLVM bytecode files,
@@ -21,19 +21,18 @@
 #include "llvm/Config/config.h"
 #include <memory>
 #include <set>
-#include <iostream>
-
 using namespace llvm;
 
 /// GetAllDefinedSymbols - Modifies its parameter DefinedSymbols to contain the
 /// name of each externally-visible symbol defined in M.
 ///
-static void 
+static void
 GetAllDefinedSymbols(Module *M, std::set<std::string> &DefinedSymbols) {
   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::giterator I = M->gbegin(), E = M->gend(); 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,7 +53,14 @@ static void
 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()) {
       if (I->isExternal())
@@ -62,14 +68,15 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
       else if (!I->hasInternalLinkage())
         DefinedSymbols.insert(I->getName());
     }
-  for (Module::giterator I = M->gbegin(), E = M->gend(); 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());
       else if (!I->hasInternalLinkage())
         DefinedSymbols.insert(I->getName());
     }
-  
+
   // Prune out any defined symbols from the undefined symbols set...
   for (std::set<std::string>::iterator I = UndefinedSymbols.begin();
        I != UndefinedSymbols.end(); )
@@ -88,7 +95,7 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
 /// Return Value:
 ///  TRUE  - An error occurred.
 ///  FALSE - No errors.
-bool 
+bool
 Linker::LinkInArchive(const sys::Path &Filename) {
 
   // Make sure this is an archive file we're dealing with
@@ -103,9 +110,9 @@ Linker::LinkInArchive(const sys::Path &Filename) {
   // no reason to link in any archive files.
   std::set<std::string> UndefinedSymbols;
   GetAllUndefinedSymbols(Composite, UndefinedSymbols);
-  
+
   if (UndefinedSymbols.empty()) {
-    verbose("No symbols undefined, skipping library '" + 
+    verbose("No symbols undefined, skipping library '" +
             Filename.toString() + "'");
     return false;  // No need to link anything in!
   }
@@ -117,7 +124,7 @@ Linker::LinkInArchive(const sys::Path &Filename) {
   Archive* arch = AutoArch.get();
 
   if (!arch)
-    return error("Cannot read archive '" + Filename.toString() + 
+    return error("Cannot read archive '" + Filename.toString() +
                  "': " + ErrMsg);
 
   // Save a set of symbols that are not defined by the archive. Since we're
@@ -126,13 +133,13 @@ Linker::LinkInArchive(const sys::Path &Filename) {
   std::set<std::string> NotDefinedByArchive;
 
   // While we are linking in object files, loop.
-  while (true) {     
+  while (true) {
 
     // Find the modules we need to link into the target module
     std::set<ModuleProvider*> Modules;
     arch->findModulesDefiningSymbols(UndefinedSymbols, Modules);
 
-    // If we didn't find any more modules to link this time, we are done 
+    // If we didn't find any more modules to link this time, we are done
     // searching this archive.
     if (Modules.empty())
       break;
@@ -151,9 +158,11 @@ Linker::LinkInArchive(const sys::Path &Filename) {
       std::auto_ptr<Module> AutoModule( (*I)->releaseModule() );
       Module* aModule = AutoModule.get();
 
+      verbose("  Linking in module: " + aModule->getModuleIdentifier());
+
       // Link it in
-      if (this->LinkInModule(aModule))
-        return error("Cannot link in module '" + 
+      if (LinkInModule(aModule))
+        return error("Cannot link in module '" +
                      aModule->getModuleIdentifier() + "': " + Error);
     }
 
@@ -162,18 +171,17 @@ Linker::LinkInArchive(const sys::Path &Filename) {
     GetAllUndefinedSymbols(Composite, UndefinedSymbols);
 
     // At this point we have two sets of undefined symbols: UndefinedSymbols
-    // which holds the undefined symbols from all the modules, and 
+    // which holds the undefined symbols from all the modules, and
     // NotDefinedByArchive which holds symbols we know the archive doesn't
     // define. There's no point searching for symbols that we won't find in the
     // archive so we subtract these sets.
-    set_subtract<std::set<std::string>,std::set<std::string> >(
-        UndefinedSymbols,NotDefinedByArchive);
-    
+    set_subtract(UndefinedSymbols, NotDefinedByArchive);
+
     // If there's no symbols left, no point in continuing to search the
     // archive.
     if (UndefinedSymbols.empty())
       break;
   }
-  
+
   return false;
 }