Fix PNaCl-local files after merging LLVM 3.4

tools/pnacl-thaw/pnacl-thaw.cpp

 /* Copyright 2013 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 //===-- pnacl-thaw.cpp - The low-level NaCl bitcode thawer ----------------===//
 //
 //===----------------------------------------------------------------------===//
 //
 // Converts NaCl wire format back to LLVM bitcode.
@@ skipping 23 matching lines @@
                cl::value_desc("filename"), cl::init("-"));
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<frozen file>"), cl::init("-"));
 
 static void WriteOutputFile(const Module *M) {
 
   std::string ErrorInfo;
   OwningPtr<tool_output_file> Out
     (new tool_output_file(OutputFilename.c_str(), ErrorInfo,
-                          raw_fd_ostream::F_Binary));
+                          sys::fs::F_Binary));
   if (!ErrorInfo.empty()) {
     errs() << ErrorInfo << '\n';
     exit(1);
   }
 
   WriteBitcodeToFile(M, Out->os());
 
   // Declare success.
   Out->keep();
 }
@@ skipping 34 matching lines @@
     if (ErrorMessage.size())
       errs() << ErrorMessage << "\n";
     else
       errs() << "bitcode didn't read correctly.\n";
     return 1;
   }
 
   WriteOutputFile(M.get());
   return 0;
 }