r322769 - [RISCV] Propagate -mabi and -march values to GNU assembler.

[Mikhail Zolotukhin via cfe-commits]

Hi,

Looks like the test is failing on MacOS [1]. Could you please take a look?

Thanks,
Michael

[1] http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-incremental/45726/consoleFull#9955924438254eaf0-7326-4999-85b0-388101f2d404 <http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-incremental/45726/consoleFull#9955924438254eaf0-7326-4999-85b0-388101f2d404>


> On Jan 17, 2018, at 2:09 PM, Ana Pazos via cfe-commits <cfe-commits at lists.llvm.org> wrote:
> 
> Author: apazos
> Date: Wed Jan 17 14:09:58 2018
> New Revision: 322769
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=322769&view=rev
> Log:
> [RISCV] Propagate -mabi and -march values to GNU assembler.
> 
> When using -fno-integrated-as flag, the gnu assembler produces code
> with some default march/mabi which later causes linker failure due
> to incompatible mabi/march.
> 
> In this patch we explicitly propagate -mabi and -march flags to the
> GNU assembler.
> 
> In this patch we explicitly propagate -mabi and -march flags to the GNU assembler.
> 
> Differential Revision: https://reviews.llvm.org/D41271
> 
> Added:
>    cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as
>    cfe/trunk/test/Driver/riscv-gnutools.c
> Modified:
>    cfe/trunk/lib/Driver/ToolChains/Gnu.cpp
> 
> Modified: cfe/trunk/lib/Driver/ToolChains/Gnu.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Gnu.cpp?rev=322769&r1=322768&r2=322769&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Wed Jan 17 14:09:58 2018
> @@ -629,6 +629,18 @@ void tools::gnutools::Assembler::Constru
>       ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
>     break;
>   }
> +  case llvm::Triple::riscv32:
> +  case llvm::Triple::riscv64: {
> +    StringRef ABIName = riscv::getRISCVABI(Args, getToolChain().getTriple());
> +    CmdArgs.push_back("-mabi");
> +    CmdArgs.push_back(ABIName.data());
> +    if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
> +      StringRef MArch = A->getValue();
> +      CmdArgs.push_back("-march");
> +      CmdArgs.push_back(MArch.data());
> +    }
> +    break;
> +  }
>   case llvm::Triple::sparc:
>   case llvm::Triple::sparcel: {
>     CmdArgs.push_back("-32");
> 
> Added: cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as?rev=322769&view=auto
> ==============================================================================
> --- cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as (added)
> +++ cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as Wed Jan 17 14:09:58 2018
> @@ -0,0 +1 @@
> +#!/bin/true
> 
> Added: cfe/trunk/test/Driver/riscv-gnutools.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/riscv-gnutools.c?rev=322769&view=auto
> ==============================================================================
> --- cfe/trunk/test/Driver/riscv-gnutools.c (added)
> +++ cfe/trunk/test/Driver/riscv-gnutools.c Wed Jan 17 14:09:58 2018
> @@ -0,0 +1,14 @@
> +// Check gnutools are invoked with propagated values for -mabi and -march.
> +
> +// RUN: %clang -target riscv32-linux-unknown-elf -fno-integrated-as \
> +// RUN: --gcc-toolchain=%S/Inputs/multilib_riscv_linux_sdk \
> +// RUN: --sysroot=%S/Inputs/multilib_riscv_linux_sdk/sysroot %s -### \
> +// RUN: 2>&1 | FileCheck -check-prefix=MABI-ILP32 %s
> +// RUN: %clang -target riscv32-linux-unknown-elf -fno-integrated-as \
> +// RUN: -march=rv32g --gcc-toolchain=%S/Inputs/multilib_riscv_linux_sdk \
> +// RUN: --sysroot=%S/Inputs/multilib_riscv_linux_sdk/sysroot %s -### \
> +// RUN: 2>&1 | FileCheck -check-prefix=MABI-ILP32-MARCH-G %s
> +
> +// MABI-ILP32: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/../../../../riscv64-unknown-linux-gnu/bin{{/|\\\\}}as" "-mabi" "ilp32"
> +// MABI-ILP32-MARCH-G: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/../../../../riscv64-unknown-linux-gnu/bin{{/|\\\\}}as" "-mabi" "ilp32" "-march" "rv32g"
> +
> 
> 
> _______________________________________________
> 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/20180117/b96b2342/attachment-0001.html>