[llvm-commits] CVS: llvm/tools/gccld/GenerateCode.cpp gccld.cpp

Chris Lattner lattner at cs.uiuc.edu
Sun Feb 13 15:02:49 PST 2005



Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.42 -> 1.43
gccld.cpp updated: 1.95 -> 1.96
---
Log message:

Make sure to null terminate argument lists!


---
Diffs of the changes:  (+4 -1)

 GenerateCode.cpp |    3 +++
 gccld.cpp        |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.42 llvm/tools/gccld/GenerateCode.cpp:1.43
--- llvm/tools/gccld/GenerateCode.cpp:1.42	Sun Dec 19 12:00:56 2004
+++ llvm/tools/gccld/GenerateCode.cpp	Sun Feb 13 17:02:34 2005
@@ -247,6 +247,7 @@
   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]);
 }
@@ -263,6 +264,7 @@
   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]);
 }
 
@@ -322,6 +324,7 @@
       args.push_back(Libraries[index].c_str());
     }
   }
+  args.push_back(0);
 
   // Run the compiler to assembly and link together the program.
   return sys::Program::ExecuteAndWait(gcc, &args[0], (const char**)clean_env);


Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.95 llvm/tools/gccld/gccld.cpp:1.96
--- llvm/tools/gccld/gccld.cpp:1.95	Sat Jan 22 11:36:16 2005
+++ llvm/tools/gccld/gccld.cpp	Sun Feb 13 17:02:34 2005
@@ -299,7 +299,7 @@
                        Libraries, gcc, envp );
 
         // Remove the assembly language file.
-        AssemblyFile.destroyFile();;
+        AssemblyFile.destroyFile();
       } else if (NativeCBE) {
         sys::Path CFile (OutputFilename);
         CFile.appendSuffix("cbe.c");






More information about the llvm-commits mailing list