commit 9988e3afcc25c6d79fd655077c3a3436a7686a4b
author Simon Atanasyan <simon@atanasyan.com> Wed Jul 16 17:34:54 2014 +0000
committer Simon Atanasyan <simon@atanasyan.com> Wed Jul 16 17:34:54 2014 +0000
tree 46b3af9788405dfe5040529f45292f540c8fe6ad
parent 07557be68fd49eaac6a2f188298fd3c869c6ef20

[Driver][Mips] If CPU name is not provided to the driver explicitly use
multilibs from the FSFS toolchain corresponding to the mips32r2/mips64r2 CPUs.

llvm-svn: 213175

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index e7dc254..e96a91d 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1632,21 +1632,6 @@
   return A && A->getOption().matches(options::OPT_mips16);
 }
 
-static bool isMips32r2(const ArgList &Args) {
-  Arg *A = Args.getLastArg(options::OPT_march_EQ,
-                           options::OPT_mcpu_EQ);
-
-  return A && A->getValue() == StringRef("mips32r2");
-}
-
-static bool isMips64r2(const ArgList &Args) {
-  Arg *A = Args.getLastArg(options::OPT_march_EQ,
-                           options::OPT_mcpu_EQ);
-
-  return A && (A->getValue() == StringRef("mips64r2") ||
-               A->getValue() == StringRef("octeon"));
-}
-
 static bool isMicroMips(const ArgList &Args) {
   Arg *A = Args.getLastArg(options::OPT_mmicromips,
                            options::OPT_mno_micromips);
@@ -1707,7 +1692,7 @@
       .gccSuffix("/mips32")
       .osSuffix("/mips32")
       .includeSuffix("/mips32")
-      .flag("+m32").flag("-m64").flag("-mmicromips").flag("-march=mips32r2");
+      .flag("+m32").flag("-m64").flag("-mmicromips").flag("+march=mips32");
 
     Multilib MArchMicroMips = Multilib()
       .gccSuffix("/micromips")
@@ -1728,7 +1713,7 @@
       .flag("-m32").flag("+m64").flag("-march=mips64r2");
 
     Multilib MArchDefault = Multilib()
-      .flag("+m32").flag("-m64").flag("+march=mips32r2");
+      .flag("+m32").flag("-m64").flag("-mmicromips").flag("+march=mips32r2");
 
     Multilib Mips16 = Multilib()
       .gccSuffix("/mips16")
@@ -1911,8 +1896,11 @@
   addMultilibFlag(isMips32(TargetArch), "m32", Flags);
   addMultilibFlag(isMips64(TargetArch), "m64", Flags);
   addMultilibFlag(isMips16(Args), "mips16", Flags);
-  addMultilibFlag(isMips32r2(Args), "march=mips32r2", Flags);
-  addMultilibFlag(isMips64r2(Args), "march=mips64r2", Flags);
+  addMultilibFlag(CPUName == "mips32", "march=mips32", Flags);
+  addMultilibFlag(CPUName == "mips32r2", "march=mips32r2", Flags);
+  addMultilibFlag(CPUName == "mips64", "march=mips64", Flags);
+  addMultilibFlag(CPUName == "mips64r2" || CPUName == "octeon",
+                  "march=mips64r2", Flags);
   addMultilibFlag(isMicroMips(Args), "mmicromips", Flags);
   addMultilibFlag(isMipsFP64(Args), "mfp64", Flags);
   addMultilibFlag(!isMipsFP64(Args), "mfp32", Flags);