[Driver][Mips] Support one more MIPS CPU name - octeon.

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 9e3686be0bd2f4bae59779f3c0cb457cf35ebc81..cc20388974ecdc77b5ea4cb4edc461e520a771dd 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -5320,6 +5320,7 @@ public:
         .Case("mips64", true)
         .Case("mips64r2", true)
         .Case("mips64r6", true)
+        .Case("octeon", true)
         .Default(false);
   }
   const std::string& getCPU() const { return CPU; }
@@ -5332,7 +5333,10 @@ public:
     Features["n64"] = false;
 
     Features[ABI] = true;
-    Features[CPU] = true;
+    if (CPU == "octeon")
+      Features["mips64r2"] = Features["cnmips"] = true;
+    else
+      Features[CPU] = true;
   }
 
   void getTargetDefines(const LangOptions &Opts,

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index d02c84d315bea1d6352dc2a4a3918044cc415d1b..1e47a62359a3614a704398e509cfd452e33e0e21 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1633,7 +1633,8 @@ static bool isMips64r2(const ArgList &Args) {
   Arg *A = Args.getLastArg(options::OPT_march_EQ,
                            options::OPT_mcpu_EQ);
 
-  return A && A->getValue() == StringRef("mips64r2");
+  return A && (A->getValue() == StringRef("mips64r2") ||
+               A->getValue() == StringRef("octeon"));
 }
 
 static bool isMicroMips(const ArgList &Args) {

diff --git a/test/Driver/mips-abi.c b/test/Driver/mips-abi.c
index f58ba0e6418d084d18b0fbaa73d8e31ca2d5c918..f75632446e2770acb6597934cd1148ac10841d10 100644 (file)
--- a/test/Driver/mips-abi.c
+++ b/test/Driver/mips-abi.c
@@ -116,6 +116,12 @@
 // MIPS-ARCH-64R2: "-target-cpu" "mips64r2"
 // MIPS-ARCH-64R2: "-target-abi" "n64"
 //
+// RUN: %clang -target mips64-linux-gnu -### -c %s \
+// RUN:        -march=octeon 2>&1 \
+// RUN:   | FileCheck -check-prefix=MIPS-ARCH-OCTEON %s
+// MIPS-ARCH-OCTEON: "-target-cpu" "octeon"
+// MIPS-ARCH-OCTEON: "-target-abi" "n64"
+//
 // RUN: not %clang -target mips64-linux-gnu -c %s \
 // RUN:        -march=mips32 2>&1 \
 // RUN:   | FileCheck -check-prefix=MIPS-ARCH-6432 %s

diff --git a/test/Driver/mips-as.c b/test/Driver/mips-as.c
index 27517accba604ea7af33821badd362f35fa4ffc9..07a588f1ace02199242499903fd47259e7c830e4 100644 (file)
--- a/test/Driver/mips-as.c
+++ b/test/Driver/mips-as.c
@@ -52,6 +52,11 @@
 // RUN:   | FileCheck -check-prefix=MIPS-32R2 %s
 // MIPS-32R2: as{{(.exe)?}}" "-march" "mips32r2" "-mabi" "32" "-EB"
 //
+// RUN: %clang -target mips64-linux-gnu -march=octeon -### \
+// RUN:   -no-integrated-as -c %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=MIPS-OCTEON %s
+// MIPS-OCTEON: as{{(.exe)?}}" "-march" "octeon" "-mabi" "64" "-EB"
+//
 // RUN: %clang -target mips-linux-gnu -mips1 -### \
 // RUN:   -no-integrated-as -c %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=MIPS-ALIAS-1 %s