diff options
author | Owen Reynolds <gbreynoo@gmail.com> | 2019-06-06 13:19:50 +0000 |
---|---|---|
committer | Owen Reynolds <gbreynoo@gmail.com> | 2019-06-06 13:19:50 +0000 |
commit | bf5bca5bea5b75faa1e66db458382929fbe4e475 (patch) | |
tree | 261bebf18b2626df6b68c94d23d2a983df90e6a9 /llvm | |
parent | dd2d1a168f49bd1bd20acd34ec43e7d803e848c2 (diff) | |
download | bcm5719-llvm-bf5bca5bea5b75faa1e66db458382929fbe4e475.tar.gz bcm5719-llvm-bf5bca5bea5b75faa1e66db458382929fbe4e475.zip |
[llvm-ar] Create thin archives with MRI scripts
This patch implements the "CREATE_THIN" MRI script command, allowing thin archives to be created via MRI scripts.
Differential Revision: https://reviews.llvm.org/D62919
llvm-svn: 362704
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/test/tools/llvm-ar/mri-thin-archive.test | 23 | ||||
-rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 6 |
2 files changed, 28 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-ar/mri-thin-archive.test b/llvm/test/tools/llvm-ar/mri-thin-archive.test new file mode 100644 index 00000000000..e759a9a25f2 --- /dev/null +++ b/llvm/test/tools/llvm-ar/mri-thin-archive.test @@ -0,0 +1,23 @@ +RUN: rm -rf %t && mkdir -p %t/addlib/ + +RUN: yaml2obj %S/Inputs/elf.yaml -o %t/elf.o +RUN: cp %t/elf.o %t/addlib/elf.o +RUN: cp %t/elf.o %t/delete.o + +RUN: cd %t && llvm-ar rTc addlib/addlib.ar addlib/elf.o + +RUN: echo "createthin %t/archive.ar" > %t/mri.script +RUN: echo "addmod elf.o" >> %t/mri.script +RUN: echo "addlib addlib/addlib.ar" >> %t/mri.script +RUN: echo "addmod delete.o" >> %t/mri.script +RUN: echo "delete delete.o" >> %t/mri.script +RUN: echo "save" >> %t/mri.script +RUN: echo "end" >> %t/mri.script + +RUN: cd %t && llvm-ar -M < mri.script +RUN: FileCheck -input-file=%t/archive.ar %s + +CHECK: !<thin> +CHECK: elf.o +CHECK-NEXT: addlib/elf.o/ +CHECK-NOT: delete.o diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 0731f35ac45..ea6d0410a63 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -952,7 +952,7 @@ static int performOperation(ArchiveOperation Operation, } static void runMRIScript() { - enum class MRICommand { AddLib, AddMod, Create, Delete, Save, End, Invalid }; + enum class MRICommand { AddLib, AddMod, Create, CreateThin, Delete, Save, End, Invalid }; ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getSTDIN(); failIfError(Buf.getError()); @@ -976,6 +976,7 @@ static void runMRIScript() { .Case("addlib", MRICommand::AddLib) .Case("addmod", MRICommand::AddMod) .Case("create", MRICommand::Create) + .Case("createthin", MRICommand::CreateThin) .Case("delete", MRICommand::Delete) .Case("save", MRICommand::Save) .Case("end", MRICommand::End) @@ -995,6 +996,9 @@ static void runMRIScript() { case MRICommand::AddMod: addMember(NewMembers, Rest); break; + case MRICommand::CreateThin: + Thin = true; + LLVM_FALLTHROUGH; case MRICommand::Create: Create = true; if (!ArchiveName.empty()) |