bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Flip LLVM verion check clause

Browse source
This commit is contained in:
Jan-Erik Rediger 2016-07-16 19:44:43 +02:00
parent f439aeef07
commit 09c3f33ec2
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/rustllvm/ArchiveWrapper.cpp
View file

@ -79,11 +79,11 @@ extern "C" RustArchiveIterator*
LLVMRustArchiveIteratorNew(RustArchive *ra) { LLVMRustArchiveIteratorNew(RustArchive *ra) {
Archive *ar = ra->getBinary(); Archive *ar = ra->getBinary();
RustArchiveIterator *rai = new RustArchiveIterator(); RustArchiveIterator *rai = new RustArchiveIterator();
#if LLVM_VERSION_MINOR >= 9 #if LLVM_VERSION_MINOR <= 8
rai->cur = ar->child_begin();
#else
Error err; Error err;
rai->cur = ar->child_begin(err); rai->cur = ar->child_begin(err);
#else
rai->cur = ar->child_begin();
#endif #endif
rai->end = ar->child_end(); rai->end = ar->child_end();
return rai; return rai;
@ -164,10 +164,10 @@ LLVMRustWriteArchive(char *Dst,
bool WriteSymbtab, bool WriteSymbtab,
Archive::Kind Kind) { Archive::Kind Kind) {
#if LLVM_VERSION_MINOR >= 9 #if LLVM_VERSION_MINOR <= 8
std::vector<NewArchiveMember> Members;
#else
std::vector<NewArchiveIterator> Members; std::vector<NewArchiveIterator> Members;
#else
std::vector<NewArchiveMember> Members;
#endif #endif
for (size_t i = 0; i < NumMembers; i++) { for (size_t i = 0; i < NumMembers; i++) {
@ -187,15 +187,15 @@ LLVMRustWriteArchive(char *Dst,
Members.push_back(NewArchiveIterator(Member->filename, Member->name)); Members.push_back(NewArchiveIterator(Member->filename, Member->name));
#endif #endif
} else { } else {
#if LLVM_VERSION_MINOR >= 9 #if LLVM_VERSION_MINOR <= 8
Members.push_back(NewArchiveIterator(Member->child, Member->name));
#else
Expected<NewArchiveMember> MOrErr = NewArchiveMember::getOldMember(Member->child, true); Expected<NewArchiveMember> MOrErr = NewArchiveMember::getOldMember(Member->child, true);
if (!MOrErr) { if (!MOrErr) {
LLVMRustSetLastError(toString(MOrErr.takeError()).c_str()); LLVMRustSetLastError(toString(MOrErr.takeError()).c_str());
return -1; return -1;
} }
Members.push_back(std::move(*MOrErr)); Members.push_back(std::move(*MOrErr));
#else
Members.push_back(NewArchiveIterator(Member->child, Member->name));
#endif #endif
} }
} }