From: Hiroshi Inoue <inouehrs@jp.ibm.com>
Date: Thu, 18 Jan 2018 06:13:25 +0000 (+0000)
Subject: Revert rC322769: [RISCV] Propagate -mabi and -march values to GNU assembler.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=217babe38c52a5449b0c1fd8b13a1719d6dec006;p=clang

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

Temporarily revert rC322769 due to buildbot failurs.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@322816 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index a99d865bdf..d7cc101a60 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -629,18 +629,6 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
       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");
diff --git a/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as b/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as
deleted file mode 100644
index b23e55619b..0000000000
--- a/test/Driver/Inputs/multilib_riscv_linux_sdk/riscv64-unknown-linux-gnu/bin/as
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/true
diff --git a/test/Driver/riscv-gnutools.c b/test/Driver/riscv-gnutools.c
deleted file mode 100644
index ffde2326cb..0000000000
--- a/test/Driver/riscv-gnutools.c
+++ /dev/null
@@ -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"
-