diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-12 20:21:39 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-12 20:21:39 +0000 |
| commit | 34ac52d9377b104c83f80184f284199d68732f07 (patch) | |
| tree | 90a9245e96c8cc8e429b785d6e13fef59f35c779 /test/Object | |
| parent | 795740b591331a0caf342edc4d572ec348415b40 (diff) | |
| download | external_llvm-34ac52d9377b104c83f80184f284199d68732f07.zip external_llvm-34ac52d9377b104c83f80184f284199d68732f07.tar.gz external_llvm-34ac52d9377b104c83f80184f284199d68732f07.tar.bz2 | |
Change llvm-ar to use lib/Object.
This fixes two bugs is lib/Object that the use in llvm-ar found:
* In OS X created archives, the name can be padded with nulls. Strip them.
* In the constructor, remember the first non special member and use that in
begin_children. This makes sure we skip all special members, not just the
first one.
The change to llvm-ar itself consist of
* Using lib/Object for reading archives instead of ArchiveReader.cpp.
* Writing the modified archive directly, instead of creating an in memory
representation.
The old Archive library was way more general than what is needed, as can
be seen by the diffstat of this patch.
Having llvm-ar using lib/Object now opens the way for creating regular symbol
tables for both native objects and bitcode files so that we can use those
archives for LTO.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186197 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Object')
| -rw-r--r-- | test/Object/archive-toc.test | 1 | ||||
| -rw-r--r-- | test/Object/directory.ll | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/Object/archive-toc.test b/test/Object/archive-toc.test index b0cf585..0a5e72b 100644 --- a/test/Object/archive-toc.test +++ b/test/Object/archive-toc.test @@ -10,6 +10,7 @@ GNU-NEXT: rw-r--r-- 500/500 2280 Nov 19 03:04 2004 IsNAN.o Test reading an archive createdy by Mac OS X ar RUN: env TZ=GMT llvm-ar tv %p/Inputs/MacOSX.a | FileCheck %s --check-prefix=OSX -strict-whitespace +OSX-NOT: __.SYMDEF OSX: rw-r--r-- 501/501 8 Nov 19 02:57 2004 evenlen OSX-NEXT: rw-r--r-- 501/501 8 Nov 19 02:57 2004 oddlen OSX-NEXT: rw-r--r-- 502/502 1465 Feb 4 06:59 2010 very_long_bytecode_file_name.bc diff --git a/test/Object/directory.ll b/test/Object/directory.ll index 336d218..48eefcb 100644 --- a/test/Object/directory.ll +++ b/test/Object/directory.ll @@ -1,12 +1,13 @@ +;RUN: rm -f %T/test.a ;RUN: not llvm-ar r %T/test.a . 2>&1 | FileCheck %s -;CHECK: . Is a directory +;CHECK: .: Is a directory ;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 ;RUN: llvm-ar r %T/test.a %T/a-very-long-file-name -;RUN: llvm-ar t %T/test.a | sort | FileCheck -check-prefix=MEMBERS %s +;RUN: llvm-ar t %T/test.a | FileCheck -check-prefix=MEMBERS %s ;MEMBERS-NOT: / -;MEMBERS: a-very-long-file-name ;MEMBERS: directory.ll +;MEMBERS: a-very-long-file-name ;MEMBERS-NOT: a-very-long-file-name |