RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-02 16:36:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implementation of MRI "delete" command.

Browse Source 
Differential Revision: https://reviews.llvm.org/D43989

llvm-svn: 326636
This commit is contained in:
Dmitry Mikulin 2018-03-02 23:23:48 +00:00
parent 1d99435130
commit 4ffb3fc4af
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/tools/llvm-ar/mri-delete.test Normal file
View File

@ -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

9
tools/llvm-ar/llvm-ar.cpp
View File

@ -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;