From: Scott Egerton <Scott.Egerton@imgtec.com>
Date: Wed, 13 Jan 2016 16:19:33 +0000 (+0000)
Subject: Revert r257602 because it breaks integrated-as.s on mips hosts.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f4541d0c68aec95561e631dc5956d9943b0fbeb;p=clang

Revert r257602 because it breaks integrated-as.s on mips hosts.


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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 3b2610e053..5a2dbd388f 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2580,7 +2580,6 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
   // When using an integrated assembler, translate -Wa, and -Xassembler
   // options.
   bool CompressDebugSections = false;
-  const char *MipsTargetFeature = nullptr;
   for (const Arg *A :
        Args.filtered(options::OPT_Wa_COMMA, options::OPT_Xassembler)) {
     A->claim();
@@ -2619,25 +2618,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
           CmdArgs.push_back("-soft-float");
           continue;
         }
-
-        MipsTargetFeature = llvm::StringSwitch<const char *>(Value)
-                      .Case("-mips1", "+mips1")
-                      .Case("-mips2", "+mips2")
-                      .Case("-mips3", "+mips3")
-                      .Case("-mips4", "+mips4")
-                      .Case("-mips5", "+mips5")
-                      .Case("-mips32", "+mips32")
-                      .Case("-mips32r2", "+mips32r2")
-                      .Case("-mips32r3", "+mips32r3")
-                      .Case("-mips32r5", "+mips32r5")
-                      .Case("-mips32r6", "+mips32r6")
-                      .Case("-mips64", "+mips64")
-                      .Case("-mips64r2", "+mips64r2")
-                      .Case("-mips64r3", "+mips64r3")
-                      .Case("-mips64r5", "+mips64r5")
-                      .Case("-mips64r6", "+mips64r6")
-                      .Default(nullptr);
-        continue;
+        break;
       }
 
       if (Value == "-force_cpusubtype_ALL") {
@@ -2685,10 +2666,6 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
     else
       D.Diag(diag::warn_debug_compression_unavailable);
   }
-  if (MipsTargetFeature != nullptr) {
-    CmdArgs.push_back("-target-feature");
-    CmdArgs.push_back(MipsTargetFeature);
-  }
 }
 
 // This adds the static libclang_rt.builtins-arch.a directly to the command line
diff --git a/test/Driver/mips-ias-Wa.s b/test/Driver/mips-ias-Wa.s
index bc65872d99..233d062d6d 100644
--- a/test/Driver/mips-ias-Wa.s
+++ b/test/Driver/mips-ias-Wa.s
@@ -47,94 +47,3 @@
 // RUN:   FileCheck -check-prefix=MSOFT-FLOAT-BOTH-MHARD-FLOAT-FIRST %s
 // MSOFT-FLOAT-BOTH-MHARD-FLOAT-FIRST: -cc1as
 // MSOFT-FLOAT-BOTH-MHARD-FLOAT-FIRST: "-target-feature" "-soft-float" "-target-feature" "+soft-float"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips1 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS1 %s
-// MIPS1: -cc1as
-// MIPS1: "-target-feature" "+mips1"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips2 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS2 %s
-// MIPS2: -cc1as
-// MIPS2: "-target-feature" "+mips2"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips3 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS3 %s
-// MIPS3: -cc1as
-// MIPS3: "-target-feature" "+mips3"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips4 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS4 %s
-// MIPS4: -cc1as
-// MIPS4: "-target-feature" "+mips4"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips5 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS5 %s
-// MIPS5: -cc1as
-// MIPS5: "-target-feature" "+mips5"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips32 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS32 %s
-// MIPS32: -cc1as
-// MIPS32: "-target-feature" "+mips32"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips32r2 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS32R2 %s
-// MIPS32R2: -cc1as
-// MIPS32R2: "-target-feature" "+mips32r2"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips32r3 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS32R3 %s
-// MIPS32R3: -cc1as
-// MIPS32R3: "-target-feature" "+mips32r3"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips32r5 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS32R5 %s
-// MIPS32R5: -cc1as
-// MIPS32R5: "-target-feature" "+mips32r5"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips32r6 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS32R6 %s
-// MIPS32R6: -cc1as
-// MIPS32R6: "-target-feature" "+mips32r6"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64 %s
-// MIPS64: -cc1as
-// MIPS64: "-target-feature" "+mips64"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64r2 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64R2 %s
-// MIPS64R2: -cc1as
-// MIPS64R2: "-target-feature" "+mips64r2"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64r3 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64R3 %s
-// MIPS64R3: -cc1as
-// MIPS64R3: "-target-feature" "+mips64r3"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64r5 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64R5 %s
-// MIPS64R5: -cc1as
-// MIPS64R5: "-target-feature" "+mips64r5"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64r6 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64R6 %s
-// MIPS64R6: -cc1as
-// MIPS64R6: "-target-feature" "+mips64r6"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64r2,-mips4 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64R2-MIPS4 %s
-// MIPS64R2-MIPS4: -cc1as
-// MIPS64R2-MIPS4-NOT: "-target-feature" "+mips64r2"
-// MIPS64R2-MIPS4: "-target-feature" "+mips4"
-// MIPS64R2-MIPS4-NOT: "-target-feature" "+mips64r2"
-
-// RUN: %clang -target mips-linux-gnu -### -fintegrated-as -c %s -Wa,-mips64,-mips32,-mips32r2 2>&1 | \
-// RUN:   FileCheck -check-prefix=MIPS64-MIPS32-MIPS32R2 %s
-// MIPS64-MIPS32-MIPS32R2: -cc1as
-// MIPS64-MIPS32-MIPS32R2-NOT: "-target-feature" "+mips64"
-// MIPS64-MIPS32-MIPS32R2-NOT: "-target-feature" "+mips32"
-// MIPS64-MIPS32-MIPS32R2: "-target-feature" "+mips32r2"
-// MIPS64-MIPS32-MIPS32R2-NOT: "-target-feature" "+mips64"
-// MIPS64-MIPS32-MIPS32R2-NOT: "-target-feature" "+mips32"