From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Sat, 22 Mar 2014 05:38:22 +0000 (+0000)
Subject: llvm-profdata: Avoid F_Text in "merge" for now, since "llvm-profdata show" is confuse... 
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4e669c9278951b0531edccd2c6f8d45854c2cee7;p=oota-llvm.git

llvm-profdata: Avoid F_Text in "merge" for now, since "llvm-profdata show" is confused with CRLF.

FIXME: line_iterator should be tolerant of CR.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204540 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp
index ce9ae9ae4f6..42783d00ff0 100644
--- a/tools/llvm-profdata/llvm-profdata.cpp
+++ b/tools/llvm-profdata/llvm-profdata.cpp
@@ -47,7 +47,8 @@ int merge_main(int argc, const char *argv[]) {
     OutputFilename = "-";
 
   std::string ErrorInfo;
-  raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_Text);
+  // FIXME: F_Text would be available if line_iterator could accept CRLF.
+  raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_None);
   if (!ErrorInfo.empty())
     exitWithError(ErrorInfo, OutputFilename);