For PR521:

With these patches we implement the ability for the Linker library to
keep track of which libraries were actually bytecode files (not archives)
and cause their users to remove such files from the list of libraries to
pass to the native linker.


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

1 files changed, 13 insertions, 1 deletions

diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index ae45100088..22a26ef91a 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -243,11 +243,23 @@ int main(int argc, char **argv, char **envp ) {
     } else {
       // Build a list of the items from our command line
       Linker::ItemList Items;
+      Linker::ItemList NativeItems;
       BuildLinkItems(Items, InputFilenames, Libraries);
 
       // Link all the items together
-      if (TheLinker.LinkInItems(Items))
+      if (TheLinker.LinkInItems(Items,NativeItems))
         return 1; // Error already printed
+
+      // Revise the Libraries based on the remaining (native) libraries that
+      // were not linked in to the bytecode. This ensures that we don't attempt
+      // to pass a bytecode library to the native linker
+      Libraries.clear(); // we've consumed the libraries except for native
+      if ((Native || NativeCBE) && !NativeItems.empty()) {
+        for (Linker::ItemList::const_iterator I = NativeItems.begin(), 
+             E = NativeItems.end(); I != E; ++I) {
+          Libraries.push_back(I->first);
+        }
+      }
     }
 
     // We're done with the Linker, so tell it to release its module