<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 21, 2014 at 7:46 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Tue Oct 21 09:46:17 2014<br>
New Revision: 220294<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=220294&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=220294&view=rev</a><br>
Log:<br>
Add support for addmod to mri scripts.<br>
<br>
Added:<br>
    llvm/trunk/test/Object/mri-addmod.test<br>
Modified:<br>
    llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br>
<br>
Added: llvm/trunk/test/Object/mri-addmod.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/mri-addmod.test?rev=220294&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/mri-addmod.test?rev=220294&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Object/mri-addmod.test (added)<br>
+++ llvm/trunk/test/Object/mri-addmod.test Tue Oct 21 09:46:17 2014<br>
@@ -0,0 +1,18 @@<br>
+; RUN: echo create %t.a > %t.mri<br>
+; RUN: echo addmod %p/Inputs/trivial-object-test.elf-x86-64 >> %t.mri<br>
+; RUN: echo save >> %t.mri<br>
+; RUN: echo end >> %t.mri<br></blockquote><div><br></div><div>Would it be possible to use relative paths here and have the MRI script be the one with the RUN lines? That would be a lot cleaner and avoid the `REQUIRES: shell`.</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+; RUN: llvm-ar -M  < %t.mri<br>
+; RUN: llvm-nm -M %t.a | FileCheck %s<br>
+<br>
+; CHECK:      Archive map<br>
+; CHECK-NEXT: main in trivial-object-test.elf-x86-64<br>
+<br>
+; CHECK:      trivial-object-test.elf-x86-64:<br>
+; CHECK-NEXT:                  U SomeOtherFunction<br>
+; CHECK-NEXT: 0000000000000000 T main<br>
+; CHECK-NEXT:                  U puts<br>
+<br>
+; line_iterator is incompatible to CRLF.<br>
+; REQUIRES: shell<br>
<br>
Modified: llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=220294&r1=220293&r2=220294&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=220294&r1=220293&r2=220294&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-ar/llvm-ar.cpp (original)<br>
+++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp Tue Oct 21 09:46:17 2014<br>
@@ -178,7 +178,7 @@ static void getMembers() {<br>
 }<br>
<br>
 namespace {<br>
-enum class MRICommand { Create, Save, End, Invalid };<br>
+enum class MRICommand { AddMod, Create, Save, End, Invalid };<br>
 }<br>
<br>
 static ArchiveOperation parseMRIScript() {<br>
@@ -192,12 +192,16 @@ static ArchiveOperation parseMRIScript()<br>
     StringRef CommandStr, Rest;<br>
     std::tie(CommandStr, Rest) = Line.split(' ');<br>
     auto Command = StringSwitch<MRICommand>(CommandStr.lower())<br>
+                       .Case("addmod", MRICommand::AddMod)<br>
                        .Case("create", MRICommand::Create)<br>
                        .Case("save", MRICommand::Save)<br>
                        .Case("end", MRICommand::End)<br>
                        .Default(MRICommand::Invalid);<br>
<br>
     switch (Command) {<br>
+    case MRICommand::AddMod:<br>
+      Members.push_back(Rest);<br>
+      break;<br>
     case MRICommand::Create:<br>
       Create = true;<br>
       if (!ArchiveName.empty())<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>