auto merge of #12548 : alexcrichton/rust/up-llvm, r=huonw,brson

Upstream LLVM has changed slightly such that our PassWrapper.cpp no longer
comiles (travis errors). This updates the bundled LLVM to the latest nightly
which will hopefully fix the travis errors we're seeing.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/llvm b/src/llvm
-Subproject b015ecddd3129490fa26e5278a1acee79f2ee5e
+Subproject 263c617d66005999afa27d00809c1568a26112e
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
index 08c17093d2a..c1655b3a415 100644
--- a/src/rustllvm/PassWrapper.cpp
+++ b/src/rustllvm/PassWrapper.cpp
@@ -166,7 +166,7 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target,
   PassManager *PM = unwrap<PassManager>(PMR);
 
   std::string ErrorInfo;
-  raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_Binary);
+  raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_None);
   if (ErrorInfo != "") {
     LLVMRustError = ErrorInfo.c_str();
     return false;
@@ -184,7 +184,7 @@ LLVMRustPrintModule(LLVMPassManagerRef PMR,
                     const char* path) {
   PassManager *PM = unwrap<PassManager>(PMR);
   std::string ErrorInfo;
-  raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_Binary);
+  raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_None);
   formatted_raw_ostream FOS(OS);
   PM->add(createPrintModulePass(FOS));
   PM->run(*unwrap(M));
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index bb7cad6eab6..3426e823b9f 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2014-02-11
+2014-02-25