From f5db715862f5471b74153f144d17f45f6f6981c5 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 8 Feb 2019 10:16:45 +0000 Subject: 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 --- .../tools/llvm-ar/flatten-thin-archive-directories.test | 15 --------------- llvm/test/tools/llvm-ar/flatten-thin-archive.test | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 llvm/test/tools/llvm-ar/flatten-thin-archive-directories.test (limited to 'llvm/test/tools/llvm-ar') diff --git a/llvm/test/tools/llvm-ar/flatten-thin-archive-directories.test b/llvm/test/tools/llvm-ar/flatten-thin-archive-directories.test deleted file mode 100644 index 6b5fc28658a..00000000000 --- a/llvm/test/tools/llvm-ar/flatten-thin-archive-directories.test +++ /dev/null @@ -1,15 +0,0 @@ -# This test creates a thin archive in a directory and adds it to a thin archive -# in the parent directory. The relative path should be included when flattening -# the archive. - -RUN: mkdir -p %t/foo -RUN: touch %t/foo/a.txt -RUN: rm -f %t/archive.a %t/foo/archive.a - -# These tests must be run in the same directory as %t/archive.a. cd %t is -# included on each line to make debugging this test case easier. -RUN: cd %t && llvm-ar rcST foo/archive.a foo/a.txt -RUN: cd %t && llvm-ar rcST archive.a foo/archive.a -RUN: cd %t && llvm-ar t archive.a | FileCheck %s --match-full-lines - -CHECK: foo/a.txt 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 -- cgit v1.2.3