<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 18, 2016 at 4:58 AM, Rafael Espindola via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</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: Wed May 18 06:58:56 2016<br>
New Revision: 269910<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269910&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=269910&view=rev</a><br>
Log:<br>
Update for llvm change.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Parse/ParseStmtAsm.cpp<br>
    cfe/trunk/tools/driver/cc1as_main.cpp<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseStmtAsm.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseStmtAsm.cpp?rev=269910&r1=269909&r2=269910&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseStmtAsm.cpp?rev=269910&r1=269909&r2=269910&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseStmtAsm.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseStmtAsm.cpp Wed May 18 06:58:56 2016<br>
@@ -572,8 +572,8 @@ StmtResult Parser::ParseMicrosoftAsmStat<br>
<br>
   llvm::SourceMgr TempSrcMgr;<br>
   llvm::MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &TempSrcMgr);<br>
-  MOFI->InitMCObjectFileInfo(TheTriple, llvm::Reloc::Default,<br>
-                             llvm::CodeModel::Default, Ctx);<br>
+  MOFI->InitMCObjectFileInfo(TheTriple, /*PIG*/ false, llvm::CodeModel::Default,<br></blockquote><div><br></div><div>Did you mean "PIC" here insted of PIG?</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">
+                             Ctx);<br>
   std::unique_ptr<llvm::MemoryBuffer> Buffer =<br>
       llvm::MemoryBuffer::getMemBuffer(AsmString, "<MS inline asm>");<br>
<br>
<br>
Modified: cfe/trunk/tools/driver/cc1as_main.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=269910&r1=269909&r2=269910&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=269910&r1=269909&r2=269910&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/driver/cc1as_main.cpp (original)<br>
+++ cfe/trunk/tools/driver/cc1as_main.cpp Wed May 18 06:58:56 2016<br>
@@ -326,19 +326,18 @@ static bool ExecuteAssembler(AssemblerIn<br>
<br>
   MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);<br>
<br>
-  llvm::Reloc::Model RM = llvm::Reloc::Default;<br>
+  bool PIC = false;<br>
   if (Opts.RelocationModel == "static") {<br>
-    RM = llvm::Reloc::Static;<br>
+    PIC = false;<br>
   } else if (Opts.RelocationModel == "pic") {<br>
-    RM = llvm::Reloc::PIC_;<br>
+    PIC = true;<br>
   } else {<br>
     assert(Opts.RelocationModel == "dynamic-no-pic" &&<br>
            "Invalid PIC model!");<br>
-    RM = llvm::Reloc::DynamicNoPIC;<br>
+    PIC = false;<br>
   }<br>
<br>
-  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), RM,<br>
-                             CodeModel::Default, Ctx);<br>
+  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), PIC, CodeModel::Default, Ctx);<br>
   if (Opts.SaveTemporaryLabels)<br>
     Ctx.setAllowTemporaryLabels(false);<br>
   if (Opts.GenDwarfForAssembly)<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>