From f1cce0ef5fdbc54b77d009f09ca6941bfa2d2322 Mon Sep 17 00:00:00 2001
From: Matt Pharr <mpharr@google.com>
Date: Wed, 17 Jul 2013 09:25:00 -0700
Subject: [PATCH] Fix build with LLVM top-of-tree

---
 cbackend.cpp | 5 +++++
 module.cpp   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/cbackend.cpp b/cbackend.cpp
index 6fedf1f3..d23bcc20 100644
--- a/cbackend.cpp
+++ b/cbackend.cpp
@@ -4914,7 +4914,12 @@ WriteCXXFile(llvm::Module *module, const char *fn, int vectorWidth,
         pm.add(new llvm::TargetData(module));
 #endif
 
+#if defined(LLVM_3_1) || defined(LLVM_3_2) || defined(LLVM_3_3)
     int flags = 0;
+#else
+    llvm::sys::fs::OpenFlags flags = llvm::sys::fs::F_None;
+#endif
+
     std::string error;
     llvm::tool_output_file *of = new llvm::tool_output_file(fn, error, flags);
     if (error.size()) {
diff --git a/module.cpp b/module.cpp
index 16abe2d4..fe82be37 100644
--- a/module.cpp
+++ b/module.cpp
@@ -1064,7 +1064,12 @@ Module::writeObjectFileOrAssembly(llvm::TargetMachine *targetMachine,
     llvm::TargetMachine::CodeGenFileType fileType = (outputType == Object) ?
         llvm::TargetMachine::CGFT_ObjectFile : llvm::TargetMachine::CGFT_AssemblyFile;
     bool binary = (fileType == llvm::TargetMachine::CGFT_ObjectFile);
+#if defined(LLVM_3_1) || defined(LLVM_3_2) || defined(LLVM_3_3)
     unsigned int flags = binary ? llvm::raw_fd_ostream::F_Binary : 0;
+#else
+    llvm::sys::fs::OpenFlags flags = binary ? llvm::sys::fs::F_Binary :
+        llvm::sys::fs::F_None;
+#endif
 
     std::string error;
     llvm::tool_output_file *of = new llvm::tool_output_file(outFileName, error, flags);