OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
bors 2014-02-25 17:41:32 -08:00
parent 3b09469a62 294b27d806
commit 2e1cfae943
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/llvm

@ -1 +1 @@
Subproject commit b015ecddd3129490fa26e5278a1acee79f2ee5ef
Subproject commit 263c617d66005999afa27d00809c1568a26112ee

4
src/rustllvm/PassWrapper.cpp
View File

@ -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));

2
src/rustllvm/llvm-auto-clean-trigger
View File

@ -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