summaryrefslogtreecommitdiffstats
path: root/llvm/include
diff options
context:
space:
mode:
authorJordan Rupprecht <rupprecht@google.com>2019-02-07 16:41:06 +0000
committerJordan Rupprecht <rupprecht@google.com>2019-02-07 16:41:06 +0000
commitbf990ab5aab03aa0aac53c9ef47ef264307804ed (patch)
tree2741b685b47afa28bba455256956be1f837cca75 /llvm/include
parentb88144e4babdb1acc2694010de377f826242e731 (diff)
downloadbcm5719-llvm-bf990ab5aab03aa0aac53c9ef47ef264307804ed.tar.gz
bcm5719-llvm-bf990ab5aab03aa0aac53c9ef47ef264307804ed.zip
[llvm-ar][libObject] Fix relative paths when nesting thin archives.
Summary: When adding one thin archive to another, we currently chop off the relative path to the flattened members. For instance, when adding `foo/child.a` (which contains `x.txt`) to `parent.a`, when flattening it we should add it as `foo/x.txt` (which exists) instead of `x.txt` (which does not exist). As a note, this also undoes the `IsNew` parameter of handling relative paths in r288280. The unit test there still passes. This was reported as part of testing the kernel build with llvm-ar: https://patchwork.kernel.org/patch/10767545/ (see the second point). Reviewers: mstorsjo, pcc, ruiu, davide, david2050 Subscribers: hiraditya, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D57842 llvm-svn: 353424
Diffstat (limited to 'llvm/include')
-rw-r--r--llvm/include/llvm/Object/ArchiveWriter.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/llvm/include/llvm/Object/ArchiveWriter.h b/llvm/include/llvm/Object/ArchiveWriter.h
index 4e796eb1adf..cca97e73484 100644
--- a/llvm/include/llvm/Object/ArchiveWriter.h
+++ b/llvm/include/llvm/Object/ArchiveWriter.h
@@ -26,7 +26,6 @@ struct NewArchiveMember {
sys::TimePoint<std::chrono::seconds> ModTime;
unsigned UID = 0, GID = 0, Perms = 0644;
- bool IsNew = false;
NewArchiveMember() = default;
NewArchiveMember(MemoryBufferRef BufRef);
OpenPOWER on IntegriCloud