For PR998:

[oota-llvm.git] / include / llvm / Linker.h

diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index f7b03c2ee5c2ba914036080746f573e76ddcd861..5a19ec6065b157eca8fb72e830f9874104e47f41 100644 (file)
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -53,7 +53,7 @@ class Linker {
     enum ControlFlags {
       Verbose       = 1, ///< Print to std::cerr what steps the linker is taking
       QuietWarnings = 2, ///< Don't print errors and warnings to std::cerr.
-      QuietErrors   = 4, ///< Indicate that this link is for a native executable
+      QuietErrors   = 4  ///< Indicate that this link is for a native executable
     };
 
   /// @}
@@ -158,7 +158,8 @@ class Linker {
     /// @see getLastError
     /// @throws nothing
     bool LinkInItems (
-      const ItemList& Items // Set of libraries/files to link in
+      const ItemList& Items, ///< Set of libraries/files to link in
+      ItemList& NativeItems  ///< Output list of native files/libs
     );
 
     /// This function links the bytecode \p Files into the composite module.
@@ -210,7 +211,8 @@ class Linker {
     /// @returns true if an error occurs, false otherwise
     /// @brief Link one library into the module
     bool LinkInLibrary (
-      const std::string& Library ///< The library to link in
+      const std::string& Library, ///< The library to link in
+      bool& is_file               ///< Indicates if lib is really a bc file
     );
 
     /// This function links one bytecode archive, \p Filename, into the module.
@@ -237,8 +239,9 @@ class Linker {
     /// @returns True if an error occurs, false otherwise.
     /// @brief Link in a module.
     bool LinkInModule(
-      Module* Src     ///< Module linked into \p Dest
-    ) { return LinkModules(Composite, Src, &Error); }
+      Module* Src,              ///< Module linked into \p Dest
+      std::string* ErrorMsg = 0 /// Error/diagnostic string
+    ) { return LinkModules(Composite, Src, ErrorMsg ); }
 
     /// This is the heart of the linker. This method will take unconditional
     /// control of the \p Src module and link it into the \p Dest module. The