Skip to content

Commit 2e1cfae

Browse files
committed
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.
2 parents 3b09469 + 294b27d commit 2e1cfae

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/llvm

Submodule llvm updated 724 files

src/rustllvm/PassWrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target,
166166
PassManager *PM = unwrap<PassManager>(PMR);
167167

168168
std::string ErrorInfo;
169-
raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_Binary);
169+
raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_None);
170170
if (ErrorInfo != "") {
171171
LLVMRustError = ErrorInfo.c_str();
172172
return false;
@@ -184,7 +184,7 @@ LLVMRustPrintModule(LLVMPassManagerRef PMR,
184184
const char* path) {
185185
PassManager *PM = unwrap<PassManager>(PMR);
186186
std::string ErrorInfo;
187-
raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_Binary);
187+
raw_fd_ostream OS(path, ErrorInfo, sys::fs::F_None);
188188
formatted_raw_ostream FOS(OS);
189189
PM->add(createPrintModulePass(FOS));
190190
PM->run(*unwrap(M));

src/rustllvm/llvm-auto-clean-trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2014-02-11
4+
2014-02-25

0 commit comments

Comments
 (0)