diff options
| -rw-r--r-- | llvm/test/tools/llvm-ar/mri-delete.test | 14 | ||||
| -rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 9 |
2 files changed, 22 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-ar/mri-delete.test b/llvm/test/tools/llvm-ar/mri-delete.test new file mode 100644 index 00000000000..82ebc54b66b --- /dev/null +++ b/llvm/test/tools/llvm-ar/mri-delete.test @@ -0,0 +1,14 @@ +RUN: yaml2obj %S/Inputs/elf.yaml -o %t.o +RUN: rm -f %t.ar + +RUN: echo "create %t.ar" > %t.mri +RUN: echo "addmod %t.o" >> %t.mri +RUN: echo "addmod %S/Inputs/elf.yaml" >> %t.mri +RUN: echo "delete %t.o" >> %t.mri +RUN: echo "save" >> %t.mri +RUN: echo "end" >> %t.mri + +RUN: llvm-ar -M < %t.mri +RUN: llvm-ar tv %t.ar | FileCheck %s + +CHECK-NOT: mri-delete.test{{.*}}.o diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index ae7d1a7f1b7..a77845a66c8 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -758,7 +758,7 @@ static int performOperation(ArchiveOperation Operation, } static void runMRIScript() { - enum class MRICommand { AddLib, AddMod, Create, Save, End, Invalid }; + enum class MRICommand { AddLib, AddMod, Create, Delete, Save, End, Invalid }; ErrorOr<std::unique_ptr<MemoryBuffer>> Buf = MemoryBuffer::getSTDIN(); failIfError(Buf.getError()); @@ -779,6 +779,7 @@ static void runMRIScript() { .Case("addlib", MRICommand::AddLib) .Case("addmod", MRICommand::AddMod) .Case("create", MRICommand::Create) + .Case("delete", MRICommand::Delete) .Case("save", MRICommand::Save) .Case("end", MRICommand::End) .Default(MRICommand::Invalid); @@ -813,6 +814,12 @@ static void runMRIScript() { fail("File already saved"); ArchiveName = Rest; break; + case MRICommand::Delete: { + StringRef Name = sys::path::filename(Rest); + llvm::erase_if(NewMembers, + [=](NewArchiveMember &M) { return M.MemberName == Name; }); + break; + } case MRICommand::Save: Saved = true; break; |
