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

[Chris Lattner]

Changes in directory llvm/lib/Linker:

LinkItems.cpp updated: 1.3 -> 1.4
LinkLibraries.cpp (r1.3) removed
---
Log message:

consolidate LinkLibraries into LinkItems


---
Diffs of the changes:  (+57 -0)

 LinkItems.cpp |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+)


Index: llvm/lib/Linker/LinkItems.cpp
diff -u llvm/lib/Linker/LinkItems.cpp:1.3 llvm/lib/Linker/LinkItems.cpp:1.4
--- llvm/lib/Linker/LinkItems.cpp:1.3	Sun Dec 12 20:59:52 2004
+++ llvm/lib/Linker/LinkItems.cpp	Tue Mar 15 16:51:40 2005
@@ -47,3 +47,60 @@
 
   return false;
 }
+
+
+/// LinkInLibrary - links one library into the HeadModule.
+///
+bool Linker::LinkInLibrary(const std::string& Lib) {
+  // Determine where this library lives.
+  sys::Path Pathname = FindLib(Lib);
+  if (Pathname.isEmpty())
+    return warning("Cannot find library '" + Lib + "'");
+
+  // If its an archive, try to link it in
+  if (Pathname.isArchive()) {
+    if (LinkInArchive(Pathname))
+      return error("Cannot link archive '" + Pathname.toString() + "'");
+  } else if (Pathname.isBytecodeFile()) {
+    // LLVM ".so" file.
+    if (LinkInFile(Pathname))
+      return error("Cannot link file '" + Pathname.toString() + "'");
+
+  } else if (Pathname.isDynamicLibrary()) {
+    return warning("Library '" + Lib + "' is a native dynamic library.");
+  } else {
+    return warning("Supposed library '" + Lib + "' isn't a library.");
+  }
+  return false;
+}
+
+/// LinkLibraries - takes the specified library files and links them into the
+/// main bytecode object file.
+///
+/// Inputs:
+///  Libraries  - The list of libraries to link into the module.
+///
+/// Return value:
+///  FALSE - No error.
+///  TRUE  - Error.
+///
+bool Linker::LinkInLibraries(const std::vector<std::string> &Libraries) {
+
+  // Process the set of libraries we've been provided.
+  for (unsigned i = 0; i < Libraries.size(); ++i)
+    if (LinkInLibrary(Libraries[i]))
+      return true;
+
+  // At this point we have processed all the libraries provided to us. Since
+  // we have an aggregated module at this point, the dependent libraries in
+  // that module should also be aggregated with duplicates eliminated. This is
+  // now the time to process the dependent libraries to resolve any remaining
+  // symbols.
+  const Module::LibraryListType& DepLibs = Composite->getLibraries();
+  for (Module::LibraryListType::const_iterator I = DepLibs.begin(), 
+      E = DepLibs.end(); I != E; ++I)
+    if (LinkInLibrary(*I)) 
+      return true;
+
+  return false;
+}