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

Handle spaces and quotes in file names in MRI scripts. 

llvm-svn: 220364
This commit is contained in:
Rafael Espindola 2014-10-22 03:10:56 +00:00
parent 277ace025d
commit 68bae2c7f6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/test/Object/mri-addmod.test
View File

@ -1,5 +1,5 @@
; RUN: echo create %t.a > %t.mri
; RUN: echo addmod %p/Inputs/trivial-object-test.elf-x86-64 >> %t.mri
; RUN: echo "addmod \"%p/Inputs/trivial-object-test.elf-x86-64\" " >> %t.mri
; RUN: echo save >> %t.mri
; RUN: echo end >> %t.mri

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

@ -961,6 +961,9 @@ static void runMRIScript() {
StringRef Line = *I;
StringRef CommandStr, Rest;
std::tie(CommandStr, Rest) = Line.split(' ');
Rest = Rest.trim();
if (!Rest.empty() && Rest.front() == '"' && Rest.back() == '"')
Rest = Rest.drop_front().drop_back();
auto Command = StringSwitch<MRICommand>(CommandStr.lower())
.Case("addlib", MRICommand::AddLib)
.Case("addmod", MRICommand::AddMod)