maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Owen Reynolds 2019-06-06 13:19:50 +00:00
parent dd2d1a168f
commit bf5bca5bea
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/test/tools/llvm-ar/mri-thin-archive.test Normal file
View File

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

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

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