diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-11-08 12:35:56 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-11-08 12:35:56 +0000 |
| commit | 6af8781854a15eadb9df6b45f27fa5cceda5eb16 (patch) | |
| tree | 234c7a0cf19a4e30c2d35d149cdca38f6fff99be | |
| parent | de712386cdde314ee18ea44b733d48a30d63de10 (diff) | |
| download | llvm-6af8781854a15eadb9df6b45f27fa5cceda5eb16.tar.gz llvm-6af8781854a15eadb9df6b45f27fa5cceda5eb16.tar.bz2 llvm-6af8781854a15eadb9df6b45f27fa5cceda5eb16.tar.xz | |
llvm-ar: Let opening a directory failed in llvm-ar.
Linux cannot open directories with open(2), although cygwin and *bsd can.
Motivation: The test, Object/directory.ll, had been failing with --target=cygwin on Linux. XFAIL was improper for host issues.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194257 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Object/directory.ll | 3 | ||||
| -rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/Object/directory.ll b/test/Object/directory.ll index bf8ff32595..48eefcb6ec 100644 --- a/test/Object/directory.ll +++ b/test/Object/directory.ll @@ -2,9 +2,6 @@ ;RUN: not llvm-ar r %T/test.a . 2>&1 | FileCheck %s ;CHECK: .: Is a directory -; Opening a directory works on cygwin and freebsd. -;XFAIL: freebsd, cygwin - ;RUN: rm -f %T/test.a ;RUN: touch %T/a-very-long-file-name ;RUN: llvm-ar r %T/test.a %s %T/a-very-long-file-name diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 64ef3fa1bb..d70db728f2 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -782,6 +782,13 @@ static void performWriteOperation(ArchiveOperation Operation, sys::fs::file_status Status; failIfError(sys::fs::status(FD, Status), FileName); + // Opening a directory doesn't make sense. Let it failed. + // Linux cannot open directories with open(2), although + // cygwin and *bsd can. + if (Status.type() == sys::fs::file_type::directory_file) + failIfError(error_code(errc::is_a_directory, posix_category()), + FileName); + OwningPtr<MemoryBuffer> File; failIfError(MemoryBuffer::getOpenFile(FD, FileName, File, Status.getSize(), false), |