Modified the logic so that library objects with main() are only linked in

if the program currently has main undefined.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10597 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index ec9f89c5e0692397d76f104bf81ffba2aedbd23c..7cd440d1d267b9c7128d208336efe660b64ebd24 100644 (file)
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -202,11 +202,14 @@ static bool LinkInArchive(Module *M,
       bool ObjectRequired = false;
 
       //
-      // If the object defines main(), then it is automatically required.
-      // Otherwise, look to see if it defines a symbol that is currently
-      // undefined.
+      // If the object defines main() and the program currently has main()
+      // undefined, then automatically link in the module.  Otherwise, look to
+      // see if it defines a symbol that is currently undefined.
       //
-      if ((DefSymbols.find ("main")) == DefSymbols.end()) {
+      if ((M->getMainFunction() == NULL) &&
+          ((DefSymbols.find ("main")) != DefSymbols.end())) {
+        ObjectRequired = true;
+      } else {
         for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
                E = UndefinedSymbols.end(); I != E; ++I)
           if (DefSymbols.count(*I)) {
@@ -217,8 +220,6 @@ static bool LinkInArchive(Module *M,
             ObjectRequired = true;
             break;
           }
-      } else {
-        ObjectRequired = true;
       }
 
       // We DO need to link this object into the program...

diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp
index ec9f89c5e0692397d76f104bf81ffba2aedbd23c..7cd440d1d267b9c7128d208336efe660b64ebd24 100644 (file)
--- a/tools/gccld/Linker.cpp
+++ b/tools/gccld/Linker.cpp
@@ -202,11 +202,14 @@ static bool LinkInArchive(Module *M,
       bool ObjectRequired = false;
 
       //
-      // If the object defines main(), then it is automatically required.
-      // Otherwise, look to see if it defines a symbol that is currently
-      // undefined.
+      // If the object defines main() and the program currently has main()
+      // undefined, then automatically link in the module.  Otherwise, look to
+      // see if it defines a symbol that is currently undefined.
       //
-      if ((DefSymbols.find ("main")) == DefSymbols.end()) {
+      if ((M->getMainFunction() == NULL) &&
+          ((DefSymbols.find ("main")) != DefSymbols.end())) {
+        ObjectRequired = true;
+      } else {
         for (std::set<std::string>::iterator I = UndefinedSymbols.begin(),
                E = UndefinedSymbols.end(); I != E; ++I)
           if (DefSymbols.count(*I)) {
@@ -217,8 +220,6 @@ static bool LinkInArchive(Module *M,
             ObjectRequired = true;
             break;
           }
-      } else {
-        ObjectRequired = true;
       }
 
       // We DO need to link this object into the program...