summaryrefslogtreecommitdiffstats
path: root/llvm/test/tools/llvm-ar/flatten-thin-archive.test
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2019-02-08 10:16:45 +0000
committerHans Wennborg <hans@hanshq.net>2019-02-08 10:16:45 +0000
commitf5db715862f5471b74153f144d17f45f6f6981c5 (patch)
treed090395dbc45d7e4bf858bf0476dd773c7765e4f /llvm/test/tools/llvm-ar/flatten-thin-archive.test
parent56dc218dc12030358b85ba9a9cafe8b0c8d3ff8e (diff)
downloadbcm5719-llvm-f5db715862f5471b74153f144d17f45f6f6981c5.tar.gz
bcm5719-llvm-f5db715862f5471b74153f144d17f45f6f6981c5.zip
Revert r353424 "[llvm-ar][libObject] Fix relative paths when nesting thin archives."
This broke the Chromium build on Windows, see https://crbug.com/930058 > 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`, whe > lattening 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 This reverts commit bf990ab5aab03aa0aac53c9ef47ef264307804ed. llvm-svn: 353507
Diffstat (limited to 'llvm/test/tools/llvm-ar/flatten-thin-archive.test')
-rw-r--r--llvm/test/tools/llvm-ar/flatten-thin-archive.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-ar/flatten-thin-archive.test b/llvm/test/tools/llvm-ar/flatten-thin-archive.test
index a80edd9d50c..430f48fe7c4 100644
--- a/llvm/test/tools/llvm-ar/flatten-thin-archive.test
+++ b/llvm/test/tools/llvm-ar/flatten-thin-archive.test
@@ -6,7 +6,7 @@
# flattened members appearing together.
RUN: touch %t-a.txt %t-b.txt %t-c.txt %t-d.txt %t-e.txt
-RUN: rm -f %t-a-plus-b.a %t-d-plus-e.a %t.a
+RUN: rm -f %t-a-plus-b.a %t.a
RUN: llvm-ar rcsT %t-a-plus-b.a %t-a.txt %t-b.txt
RUN: llvm-ar rcs %t-d-plus-e.a %t-d.txt %t-e.txt
RUN: llvm-ar rcsT %t.a %t-a-plus-b.a %t-c.txt %t-d-plus-e.a
OpenPOWER on IntegriCloud