From 294b27d80686fe2a698c166f223cfee216db3332 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 25 Feb 2014 09:26:11 -0800 Subject: [PATCH] Update LLVM 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. --- src/llvm | 2 +- src/rustllvm/PassWrapper.cpp | 4 ++-- src/rustllvm/llvm-auto-clean-trigger | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/llvm b/src/llvm index b015ecddd3129..263c617d66005 160000 --- a/src/llvm +++ b/src/llvm @@ -1 +1 @@ -Subproject commit b015ecddd3129490fa26e5278a1acee79f2ee5ef +Subproject commit 263c617d66005999afa27d00809c1568a26112ee diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 08c17093d2a3c..c1655b3a41500 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -166,7 +166,7 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, PassManager *PM = unwrap(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(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 bb7cad6eab64f..3426e823b9f67 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