[llvm-commits] CVS: llvm/tools/link/link.cpp

[John Criswell]

Changes in directory llvm/tools/link:

link.cpp updated: 1.24 -> 1.24.2.1

---
Log message:

Merged with mainline on Thursday, June 26, 2003.


---
Diffs of the changes:

Index: llvm/tools/link/link.cpp
diff -u llvm/tools/link/link.cpp:1.24 llvm/tools/link/link.cpp:1.24.2.1
--- llvm/tools/link/link.cpp:1.24	Thu May 22 15:13:15 2003
+++ llvm/tools/link/link.cpp	Thu Jun 26 16:36:10 2003
@@ -4,9 +4,6 @@
 // This utility may be invoked in the following manner:
 //  link a.bc b.bc c.bc -o x.bc
 //
-// Alternatively, this can be used as an 'ar' tool as well.  If invoked as
-// either 'ar' or 'llvm-ar', it accepts a 'rc' parameter as well.
-//
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Utils/Linker.h"
@@ -89,13 +86,6 @@
 
   unsigned BaseArg = 0;
   std::string ErrorMessage;
-
-  // TODO: TEST argv[0] for llvm-ar forms... for now, this is a huge hack.
-  if (InputFilenames.size() >= 3 && InputFilenames[0] == "rc" &&
-      OutputFilename == "-") {
-    BaseArg = 2;
-    OutputFilename = InputFilenames[1];
-  }
 
   std::auto_ptr<Module> Composite(LoadFile(InputFilenames[BaseArg]));
   if (Composite.get() == 0) return 1;