Add Binary flag to raw_fd_ostream constructor.

Document raw_fd_ostream's treatment of "-".

llvm-svn: 59219

2 files changed, 6 insertions, 3 deletions

diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index f185490725a..bd915ae7d6f 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -125,7 +125,7 @@ static raw_ostream *GetOutputStream(const char *ProgName) {
     sys::RemoveFileOnSignal(sys::Path(OutputFilename));
 
     std::string error;
-    raw_ostream *Out = new raw_fd_ostream(OutputFilename.c_str(), error);
+    raw_ostream *Out = new raw_fd_ostream(OutputFilename.c_str(), true, error);
     if (!error.empty()) {
       std::cerr << error << '\n';
       delete Out;
@@ -142,6 +142,7 @@ static raw_ostream *GetOutputStream(const char *ProgName) {
 
   OutputFilename = GetFileNameRoot(InputFilename);
     
+  bool Binary = false;
   switch (FileType) {
   case TargetMachine::AssemblyFile:
     if (MArch->Name[0] == 'c') {
@@ -156,9 +157,11 @@ static raw_ostream *GetOutputStream(const char *ProgName) {
     break;
   case TargetMachine::ObjectFile:
     OutputFilename += ".o";
+    Binary = true;
     break;
   case TargetMachine::DynamicLibrary:
     OutputFilename += LTDL_SHLIB_EXT;
+    Binary = true;
     break;
   }
   
@@ -175,7 +178,7 @@ static raw_ostream *GetOutputStream(const char *ProgName) {
   sys::RemoveFileOnSignal(sys::Path(OutputFilename));
   
   std::string error;
-  raw_ostream *Out = new raw_fd_ostream(OutputFilename.c_str(), error);
+  raw_ostream *Out = new raw_fd_ostream(OutputFilename.c_str(), Binary, error);
   if (!error.empty()) {
     std::cerr << error << '\n';
     delete Out;
diff --git a/llvm/tools/lto/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp
index 0474a88839f..e0e1f52b330 100644
--- a/llvm/tools/lto/LTOCodeGenerator.cpp
+++ b/llvm/tools/lto/LTOCodeGenerator.cpp
@@ -165,7 +165,7 @@ const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg)
     // generate assembly code
     bool genResult = false;
     {
-      raw_fd_ostream asmFile(uniqueAsmPath.c_str(), errMsg);
+      raw_fd_ostream asmFile(uniqueAsmPath.c_str(), false, errMsg);
       if (!errMsg.empty())
         return NULL;
       genResult = this->generateAssemblyCode(asmFile, errMsg);