r269910 - Update for llvm change.

[Sean Silva via cfe-commits]

On Wed, May 18, 2016 at 4:58 AM, Rafael Espindola via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: rafael
> Date: Wed May 18 06:58:56 2016
> New Revision: 269910
>
> URL: http://llvm.org/viewvc/llvm-project?rev=269910&view=rev
> Log:
> Update for llvm change.
>
> Modified:
>     cfe/trunk/lib/Parse/ParseStmtAsm.cpp
>     cfe/trunk/tools/driver/cc1as_main.cpp
>
> Modified: cfe/trunk/lib/Parse/ParseStmtAsm.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseStmtAsm.cpp?rev=269910&r1=269909&r2=269910&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseStmtAsm.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseStmtAsm.cpp Wed May 18 06:58:56 2016
> @@ -572,8 +572,8 @@ StmtResult Parser::ParseMicrosoftAsmStat
>
>    llvm::SourceMgr TempSrcMgr;
>    llvm::MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &TempSrcMgr);
> -  MOFI->InitMCObjectFileInfo(TheTriple, llvm::Reloc::Default,
> -                             llvm::CodeModel::Default, Ctx);
> +  MOFI->InitMCObjectFileInfo(TheTriple, /*PIG*/ false,
> llvm::CodeModel::Default,
>

Did you mean "PIC" here insted of PIG?

-- Sean Silva


> +                             Ctx);
>    std::unique_ptr<llvm::MemoryBuffer> Buffer =
>        llvm::MemoryBuffer::getMemBuffer(AsmString, "<MS inline asm>");
>
>
> Modified: cfe/trunk/tools/driver/cc1as_main.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=269910&r1=269909&r2=269910&view=diff
>
> ==============================================================================
> --- cfe/trunk/tools/driver/cc1as_main.cpp (original)
> +++ cfe/trunk/tools/driver/cc1as_main.cpp Wed May 18 06:58:56 2016
> @@ -326,19 +326,18 @@ static bool ExecuteAssembler(AssemblerIn
>
>    MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
>
> -  llvm::Reloc::Model RM = llvm::Reloc::Default;
> +  bool PIC = false;
>    if (Opts.RelocationModel == "static") {
> -    RM = llvm::Reloc::Static;
> +    PIC = false;
>    } else if (Opts.RelocationModel == "pic") {
> -    RM = llvm::Reloc::PIC_;
> +    PIC = true;
>    } else {
>      assert(Opts.RelocationModel == "dynamic-no-pic" &&
>             "Invalid PIC model!");
> -    RM = llvm::Reloc::DynamicNoPIC;
> +    PIC = false;
>    }
>
> -  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), RM,
> -                             CodeModel::Default, Ctx);
> +  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), PIC,
> CodeModel::Default, Ctx);
>    if (Opts.SaveTemporaryLabels)
>      Ctx.setAllowTemporaryLabels(false);
>    if (Opts.GenDwarfForAssembly)
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160518/32c210a1/attachment.html>