X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FLinker.h;h=66a848336709fe54b1718f35310e278b69528fcf;hb=a727d5502c8e23c090da658bf14c5ebc1169a070;hp=b260dc3fc17e8b2731784abff4d9cd582c1a1f49;hpb=410354fe0c052141dadeca939395743f8dd58e38;p=oota-llvm.git

diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index b260dc3fc17..66a84833670 100644
--- a/include/llvm/Linker.h
+++ b/include/llvm/Linker.h
@@ -182,7 +182,8 @@ class Linker {
     /// @see getLastError
     /// @brief Link in a single file.
     bool LinkInFile(
-      const sys::Path& File ///< File to link in.
+      const sys::Path& File, ///< File to link in.
+      bool &is_native        ///< Indicates if the file is native object file
     );
 
     /// This function provides a way to selectively link in a set of modules,
@@ -212,7 +213,7 @@ class Linker {
     /// @brief Link one library into the module
     bool LinkInLibrary (
       const std::string& Library, ///< The library to link in
-      bool& is_file               ///< Indicates if lib is really a bc file
+      bool& is_native             ///< Indicates if lib a native library
     );
 
     /// This function links one bytecode archive, \p Filename, into the module.
@@ -228,7 +229,8 @@ class Linker {
     /// @returns true if an error occurs, otherwise false.
     /// @brief Link in one archive.
     bool LinkInArchive(
-      const sys::Path& Filename ///< Filename of the archive to link
+      const sys::Path& Filename, ///< Filename of the archive to link
+      bool& is_native            ///<  Indicates if archive is a native archive
     );
 
     /// This method links the \p Src module into the Linker's Composite module
@@ -239,8 +241,11 @@ 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