Skip to content

Commit

Permalink
Update LLVM
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alexcrichton committed Feb 25, 2014
1 parent 34a224f commit 294b27d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/llvm
Submodule llvm updated 724 files
4 changes: 2 additions & 2 deletions src/rustllvm/PassWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/rustllvm/llvm-auto-clean-trigger
Original file line number Diff line number Diff line change
@@ -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

5 comments on commit 294b27d

@bors
Copy link
Contributor

@bors bors commented on 294b27d Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from huonw, brson
at alexcrichton@294b27d

@bors
Copy link
Contributor

@bors bors commented on 294b27d Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/up-llvm = 294b27d into auto

@bors
Copy link
Contributor

@bors bors commented on 294b27d Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/up-llvm = 294b27d merged ok, testing candidate = 2e1cfae

@bors
Copy link
Contributor

@bors bors commented on 294b27d Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 294b27d Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 2e1cfae

Please sign in to comment.