bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Updated LLVM for iOS

Browse source 
There should be no more problems during SjLj pass
This commit is contained in:
Valerii Hiora 2014-07-23 09:14:58 +03:00 • committed by Alex Crichton
parent 4ea1dd5494
commit 57cade5744
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/llvm

@ -1 +1 @@
Subproject commit d66318a4aae089bae5c3c38ee42daaa1bd8fadb7 Subproject commit cd24b5c6633b27df2b84249a65a46a610b734494

11
src/rustllvm/RustWrapper.cpp
View file

@ -658,13 +658,14 @@ LLVMRustLinkInExternalBitcode(LLVMModuleRef dst, char *bc, size_t len) {
#if LLVM_VERSION_MINOR >= 5 #if LLVM_VERSION_MINOR >= 5
extern "C" void* extern "C" void*
LLVMRustOpenArchive(char *path) { LLVMRustOpenArchive(char *path) {
std::unique_ptr<MemoryBuffer> buf; ErrorOr<std::unique_ptr<MemoryBuffer>> buf_or = MemoryBuffer::getFile(path);
std::error_code err = MemoryBuffer::getFile(path, buf); if (!buf_or) {
if (err) { LLVMRustSetLastError(buf_or.getError().message().c_str());
LLVMRustSetLastError(err.message().c_str());
return NULL; return NULL;
} }
Archive *ret = new Archive(buf.release(), err);
std::error_code err;
Archive *ret = new Archive(std::move(buf_or.get()), err);
if (err) { if (err) {
LLVMRustSetLastError(err.message().c_str()); LLVMRustSetLastError(err.message().c_str());
return NULL; return NULL;

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. # 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 # 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. # build bots then the contents should be changed so git updates the mtime.
2014-07-21 2014-07-22