parent
5326d073f6
commit
2bd9638ec4
@ -1,58 +0,0 @@
|
|||||||
From e8bfc4d9876f09b2bf08420998a92a002f752edb Mon Sep 17 00:00:00 2001
|
|
||||||
From: kinke <kinke@users.noreply.github.com>
|
|
||||||
Date: Tue, 26 Sep 2017 20:04:39 +0200
|
|
||||||
Subject: [PATCH] Adapt embedded llvm-ar to LLVM 5.0 final (#2349)
|
|
||||||
|
|
||||||
---
|
|
||||||
driver/archiver.cpp | 14 +++++++++-----
|
|
||||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/driver/archiver.cpp b/driver/archiver.cpp
|
|
||||||
index 78cafc8..7893129 100644
|
|
||||||
--- a/driver/archiver.cpp
|
|
||||||
+++ b/driver/archiver.cpp
|
|
||||||
@@ -50,7 +50,7 @@ bool Symtab = true;
|
|
||||||
bool Deterministic = true;
|
|
||||||
bool Thin = false;
|
|
||||||
|
|
||||||
-void fail(Twine Error) { outs() << "llvm-ar: " << Error << ".\n"; }
|
|
||||||
+void fail(Twine Error) { errs() << "llvm-ar: " << Error << ".\n"; }
|
|
||||||
|
|
||||||
void fail(std::error_code EC, std::string Context = {}) {
|
|
||||||
if (Context.empty())
|
|
||||||
@@ -79,6 +79,12 @@ int addMember(std::vector<NewArchiveMember> &Members, StringRef FileName,
|
|
||||||
fail(std::move(Error), FileName);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#if LDC_LLVM_VER >= 500
|
|
||||||
+ // Use the basename of the object path for the member name.
|
|
||||||
+ NMOrErr->MemberName = sys::path::filename(NMOrErr->MemberName);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
if (Pos == -1)
|
|
||||||
Members.push_back(std::move(*NMOrErr));
|
|
||||||
else
|
|
||||||
@@ -221,7 +227,7 @@ int performWriteOperation() {
|
|
||||||
auto Buf = MemoryBuffer::getFile(ArchiveName, -1, false);
|
|
||||||
std::error_code EC = Buf.getError();
|
|
||||||
if (EC && EC != errc::no_such_file_or_directory) {
|
|
||||||
- fail("error opening '" + ArchiveName + "': " + EC.message() + "!");
|
|
||||||
+ fail("error opening '" + ArchiveName + "': " + EC.message());
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -230,9 +236,7 @@ int performWriteOperation() {
|
|
||||||
object::Archive Archive(Buf.get()->getMemBufferRef(), Err);
|
|
||||||
EC = errorToErrorCode(std::move(Err));
|
|
||||||
if (EC) {
|
|
||||||
- fail(
|
|
||||||
- EC,
|
|
||||||
- ("error loading '" + ArchiveName + "': " + EC.message() + "!").str());
|
|
||||||
+ fail(EC, ("error loading '" + ArchiveName + "': " + EC.message()).str());
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return performWriteOperation(&Archive, std::move(Buf.get()));
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
|||||||
SHA512 (ldc-0.17.4-src.tar.gz) = d45abd1506387dca8d2eef6b5afe41b3015d362d09c7fc26c6ee861140d67690ee3db31cc06ca313ba39d5f75b9620db870410140e0dd78b9038361432b238ba
|
SHA512 (ldc-0.17.4-src.tar.gz) = d45abd1506387dca8d2eef6b5afe41b3015d362d09c7fc26c6ee861140d67690ee3db31cc06ca313ba39d5f75b9620db870410140e0dd78b9038361432b238ba
|
||||||
SHA512 (ldc-1.4.0-src.tar.gz) = 68bd34323733a52f56f9542f542ce9391a588d46bbdb8b277b3a44caf8b2ed4c1721f1d2f9141a93e7569e25c6072a7e9aaf2f14f0172dd6b95c335bbc6815cb
|
SHA512 (ldc-1.8.0-beta1-src.tar.gz) = ced531c9ff419085b8f08dfcaed8fc317607ced94df6b968964794626b84cff0da3a4f70ea8a7d24cce0d39ef6a3a2a59b221aa08f5785fd7c2d4c3c9f1eac63
|
||||||
|
Loading…
Reference in new issue