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

[Bill Wendling]

Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.66 -> 1.67
gccld.cpp updated: 1.114 -> 1.115
---
Log message:

Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.


---
Diffs of the changes:  (+21 -21)

 GenerateCode.cpp |    8 ++++----
 gccld.cpp        |   34 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 21 deletions(-)


Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.66 llvm/tools/gccld/GenerateCode.cpp:1.67
--- llvm/tools/gccld/GenerateCode.cpp:1.66	Tue Nov 28 18:19:40 2006
+++ llvm/tools/gccld/GenerateCode.cpp	Wed Dec  6 19:30:31 2006
@@ -123,10 +123,10 @@
 }
 
 static void dumpArgs(const char **args) {
-  llvm_cerr << *args++;
+  cerr << *args++;
   while (*args)
-    llvm_cerr << ' ' << *args++;
-  llvm_cerr << '\n' << std::flush;
+    cerr << ' ' << *args++;
+  cerr << '\n' << std::flush;
 }
 
 static inline void addPass(PassManager &PM, Pass *P) {
@@ -283,7 +283,7 @@
   Passes.add(createVerifierPass());
 
   // Add the pass that writes bytecode to the output file...
-  llvm_ostream L(*Out);
+  OStream L(*Out);
   addPass(Passes, new WriteBytecodePass(&L, false, !NoCompress));
 
   // Run our queue of passes all at once now, efficiently.


Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.114 llvm/tools/gccld/gccld.cpp:1.115
--- llvm/tools/gccld/gccld.cpp:1.114	Tue Dec  5 19:18:00 2006
+++ llvm/tools/gccld/gccld.cpp	Wed Dec  6 19:30:31 2006
@@ -127,7 +127,7 @@
 ///  Message  - The message to print to standard error.
 ///
 static int PrintAndReturn(const char *progname, const std::string &Message) {
-  llvm_cerr << progname << ": " << Message << "\n";
+  cerr << progname << ": " << Message << "\n";
   return 1;
 }
 
@@ -141,11 +141,11 @@
   std::string ErrMsg;  
   sys::Path llvmstub = FindExecutable("llvm-stub.exe", argv[0]);
   if (llvmstub.isEmpty()) {
-    llvm_cerr << "Could not find llvm-stub.exe executable!\n";
+    cerr << "Could not find llvm-stub.exe executable!\n";
     exit(1);
   }
   if (0 != sys::CopyFile(sys::Path(OutputFilename), llvmstub, &ErrMsg)) {
-    llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+    cerr << argv[0] << ": " << ErrMsg << "\n";
     exit(1);    
   }
 
@@ -326,18 +326,18 @@
         return PrintAndReturn(argv[0], "Failed to find gcc");
 
       // Generate an assembly language file for the bytecode.
-      if (Verbose) llvm_cout << "Generating Assembly Code\n";
+      if (Verbose) cout << "Generating Assembly Code\n";
       std::string ErrMsg;
       if (0 != GenerateAssembly(
           AssemblyFile.toString(), RealBytecodeOutput, llc, ErrMsg, Verbose)) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 2;
       }
-      if (Verbose) llvm_cout << "Generating Native Code\n";
+      if (Verbose) cout << "Generating Native Code\n";
       if (0 != GenerateNative(OutputFilename, AssemblyFile.toString(),
                      LibPaths, Libraries, gcc, envp, LinkAsLibrary,
                      NoInternalize, RPath, SOName, ErrMsg, Verbose) ) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 2;
       }
 
@@ -366,18 +366,18 @@
         return PrintAndReturn(argv[0], "Failed to find gcc");
 
       // Generate an assembly language file for the bytecode.
-      if (Verbose) llvm_cout << "Generating C Source Code\n";
+      if (Verbose) cout << "Generating C Source Code\n";
       std::string ErrMsg;
       if (0 != GenerateCFile(
           CFile.toString(), RealBytecodeOutput, llc, ErrMsg, Verbose)) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 2;
       }
-      if (Verbose) llvm_cout << "Generating Native Code\n";
+      if (Verbose) cout << "Generating Native Code\n";
       if (0 != GenerateNative(OutputFilename, CFile.toString(),
                      LibPaths, Libraries, gcc, envp, LinkAsLibrary,
                      NoInternalize, RPath, SOName, ErrMsg, Verbose)) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 2;
       }
 
@@ -394,11 +394,11 @@
       // Make the bytecode file readable and directly executable in LLEE
       std::string ErrMsg;
       if (sys::Path(RealBytecodeOutput).makeExecutableOnDisk(&ErrMsg)) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 1;
       }
       if (sys::Path(RealBytecodeOutput).makeReadableOnDisk(&ErrMsg)) {
-        llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+        cerr << argv[0] << ": " << ErrMsg << "\n";
         return 1;
       }
     }
@@ -406,18 +406,18 @@
     // Make the output, whether native or script, executable as well...
     std::string ErrMsg;
     if (sys::Path(OutputFilename).makeExecutableOnDisk(&ErrMsg)) {
-      llvm_cerr << argv[0] << ": " << ErrMsg << "\n";
+      cerr << argv[0] << ": " << ErrMsg << "\n";
       return 1;
     }
   } catch (const char*msg) {
-    llvm_cerr << argv[0] << ": " << msg << "\n";
+    cerr << argv[0] << ": " << msg << "\n";
     exitCode = 1;
   } catch (const std::string& msg) {
-    llvm_cerr << argv[0] << ": " << msg << "\n";
+    cerr << argv[0] << ": " << msg << "\n";
     exitCode = 2;
   } catch (...) {
     // This really shouldn't happen, but just in case ....
-    llvm_cerr << argv[0] << ": An unexpected unknown exception occurred.\n";
+    cerr << argv[0] << ": An unexpected unknown exception occurred.\n";
     exitCode = 3;
   }