In Thumb2, direct branches can be encoded as either a "short" conditional branch...

[oota-llvm.git] / utils / FileUpdate / FileUpdate.cpp

diff --git a/utils/FileUpdate/FileUpdate.cpp b/utils/FileUpdate/FileUpdate.cpp
index 8377aea79e84fdaa8f3e3454a278cba75c0a45ca..3514d0f21571bf79c2bb3b77ad2275656b1e5de7 100644 (file)
--- a/utils/FileUpdate/FileUpdate.cpp
+++ b/utils/FileUpdate/FileUpdate.cpp
@@ -16,8 +16,9 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/ToolOutputFile.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/system_error.h"
 using namespace llvm;
 
 static cl::opt<bool>
@@ -42,17 +43,17 @@ int main(int argc, char **argv) {
   }
 
   // Get the input data.
-  std::string ErrorStr;
+  error_code ec;
   MemoryBuffer *In =
-    MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), &ErrorStr);
+    MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), ec);
   if (In == 0) {
     errs() << argv[0] << ": error: Unable to get input '"
-           << InputFilename << "': " << ErrorStr << '\n';
+           << InputFilename << "': " << ec.message() << '\n';
     return 1;
   }
 
   // Get the output data.
-  MemoryBuffer *Out = MemoryBuffer::getFile(OutputFilename.c_str(), &ErrorStr);
+  MemoryBuffer *Out = MemoryBuffer::getFile(OutputFilename.c_str(), ec);
 
   // If the output exists and the contents match, we are done.
   if (Out && In->getBufferSize() == Out->getBufferSize() &&
@@ -70,6 +71,7 @@ int main(int argc, char **argv) {
   if (!Quiet)
     errs() << argv[0] << ": Updating '" << OutputFilename
            << "', contents changed.\n";
+  std::string ErrorStr;
   tool_output_file OutStream(OutputFilename.c_str(), ErrorStr,
                              raw_fd_ostream::F_Binary);
   if (!ErrorStr.empty()) {
@@ -78,7 +80,7 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  OutStream.write(In->getBufferStart(), In->getBufferSize());
+  OutStream.os().write(In->getBufferStart(), In->getBufferSize());
 
   // Declare success.
   OutStream.keep();