r322816 - Revert rC322769: [RISCV] Propagate -mabi and -march values to GNU assembler.

Hiroshi Inoue via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 17 22:13:25 PST 2018


Author: inouehrs
Date: Wed Jan 17 22:13:25 2018
New Revision: 322816

URL: http://llvm.org/viewvc/llvm-project?rev=322816&view=rev
Log:
Revert rC322769: [RISCV] Propagate -mabi and -march values to GNU assembler.

Temporarily revert rC322769 due to buildbot failurs.


Removed:
    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=322816&r1=322815&r2=322816&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Gnu.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Gnu.cpp Wed Jan 17 22:13:25 2018
@@ -629,18 +629,6 @@ 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");

Removed: 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=322815&view=auto
==============================================================================
--- cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as (original)
+++ cfe/trunk/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as (removed)
@@ -1 +0,0 @@
-#!/bin/true

Removed: cfe/trunk/test/Driver/riscv-gnutools.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/riscv-gnutools.c?rev=322815&view=auto
==============================================================================
--- cfe/trunk/test/Driver/riscv-gnutools.c (original)
+++ cfe/trunk/test/Driver/riscv-gnutools.c (removed)
@@ -1,14 +0,0 @@
-// 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"
-




More information about the cfe-commits mailing list