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

[Chris Lattner]

Changes in directory llvm/tools/llvm-ld:

llvm-ld.cpp updated: 1.22 -> 1.23
---
Log message:

The first argument to ExecuteAndWait should be the program name, but pointed
out by Markus F.X.J. Oberhumer.



---
Diffs of the changes:  (+12 -9)

 llvm-ld.cpp |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)


Index: llvm/tools/llvm-ld/llvm-ld.cpp
diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.22 llvm/tools/llvm-ld/llvm-ld.cpp:1.23
--- llvm/tools/llvm-ld/llvm-ld.cpp:1.22	Sun Feb 13 17:10:45 2005
+++ llvm/tools/llvm-ld/llvm-ld.cpp	Sun Apr 10 15:59:38 2005
@@ -221,10 +221,11 @@
                             const sys::Path &llc) {
   // Run LLC to convert the bytecode file into assembly code.
   std::vector<const char*> args;
-  args.push_back( "-f");
-  args.push_back( "-o");
-  args.push_back( OutputFilename.c_str() );
-  args.push_back( InputFilename.c_str() );
+  args.push_back(llc.c_str());
+  args.push_back("-f");
+  args.push_back("-o");
+  args.push_back(OutputFilename.c_str());
+  args.push_back(InputFilename.c_str());
   args.push_back(0);
 
   return sys::Program::ExecuteAndWait(llc,&args[0]);
@@ -237,11 +238,12 @@
                          const sys::Path &llc) {
   // Run LLC to convert the bytecode file into C.
   std::vector<const char*> args;
-  args.push_back( "-march=c");
-  args.push_back( "-f");
-  args.push_back( "-o");
-  args.push_back( OutputFile.c_str() );
-  args.push_back( InputFile.c_str() );
+  args.push_back(llc.c_str());
+  args.push_back("-march=c");
+  args.push_back("-f");
+  args.push_back("-o");
+  args.push_back(OutputFile.c_str());
+  args.push_back(InputFile.c_str());
   args.push_back(0);
   return sys::Program::ExecuteAndWait(llc, &args[0]);
 }
@@ -290,6 +292,7 @@
   //  and linker because we don't know where to put the _start symbol.
   //  GCC mysteriously knows how to do it.
   std::vector<const char*> args;
+  args.push_back(gcc.c_str());
   args.push_back("-fno-strict-aliasing");
   args.push_back("-O3");
   args.push_back("-o");