From: Simon Atanasyan <simon@atanasyan.com>
Date: Tue, 1 Jul 2014 10:59:09 +0000 (+0000)
Subject: [Driver][Mips] MIPS ABI names "32" and "64" used as arguments of the "-mabi"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc7c40b69a956cd3d422777113440dcf7f544a12;p=clang

[Driver][Mips] MIPS ABI names "32" and "64" used as arguments of the "-mabi"
command line option only. Internally we convert them to the "o32" and "n64"
respectively. So we do not need to refer them anywhere after that conversion.

No functional changes.

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

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 34608f17a1..3ce8c3723a 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -5524,10 +5524,6 @@ public:
       ABI = Name;
       return true;
     }
-    if (Name == "32") {
-      ABI = "o32";
-      return true;
-    }
     return false;
   }
   void getTargetDefines(const LangOptions &Opts,
@@ -5663,9 +5659,9 @@ public:
       ABI = Name;
       return true;
     }
-    if (Name == "n64" || Name == "64") {
+    if (Name == "n64") {
       setN64ABITypes();
-      ABI = "n64";
+      ABI = Name;
       return true;
     }
     return false;
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 093c936fe5..c7211686e9 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -950,8 +950,8 @@ static void getMipsCPUAndABI(const ArgList &Args,
   if (!ABIName.empty()) {
     // Deduce CPU name from ABI name.
     CPUName = llvm::StringSwitch<const char *>(ABIName)
-      .Cases("32", "o32", "eabi", DefMips32CPU)
-      .Cases("n32", "n64", "64", DefMips64CPU)
+      .Cases("o32", "eabi", DefMips32CPU)
+      .Cases("n32", "n64", DefMips64CPU)
       .Default("");
   }
   else if (!CPUName.empty()) {