From e69ff5b01d85bf4779133e65574da0b94b03497c Mon Sep 17 00:00:00 2001
From: Tim Northover <tnorthover@apple.com>
Date: Sun, 30 Mar 2014 07:25:23 +0000
Subject: [PATCH] ARM64: remove -m32/-m64 mapping with ARM.

This is causing the ARM build-bots to fail since they only include
the ARM backend and can't create an ARM64 target.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205132 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Support/Triple.cpp       | 4 ++--
 unittests/ADT/TripleTest.cpp | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 9e91642d975..1dc279a0db4 100644
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -823,6 +823,7 @@ Triple Triple::get32BitArchVariant() const {
   case Triple::UnknownArch:
   case Triple::aarch64:
   case Triple::aarch64_be:
+  case Triple::arm64:
   case Triple::msp430:
   case Triple::systemz:
   case Triple::ppc64le:
@@ -856,7 +857,6 @@ Triple Triple::get32BitArchVariant() const {
   case Triple::sparcv9:   T.setArch(Triple::sparc);   break;
   case Triple::x86_64:    T.setArch(Triple::x86);     break;
   case Triple::spir64:    T.setArch(Triple::spir);    break;
-  case Triple::arm64:     T.setArch(Triple::arm);     break;
   }
   return T;
 }
@@ -866,6 +866,7 @@ Triple Triple::get64BitArchVariant() const {
   switch (getArch()) {
   case Triple::UnknownArch:
   case Triple::amdil:
+  case Triple::arm:
   case Triple::armeb:
   case Triple::hexagon:
   case Triple::le32:
@@ -900,7 +901,6 @@ Triple Triple::get64BitArchVariant() const {
   case Triple::sparc:   T.setArch(Triple::sparcv9);   break;
   case Triple::x86:     T.setArch(Triple::x86_64);    break;
   case Triple::spir:    T.setArch(Triple::spir64);    break;
-  case Triple::arm:     T.setArch(Triple::arm64);     break;
   }
   return T;
 }
diff --git a/unittests/ADT/TripleTest.cpp b/unittests/ADT/TripleTest.cpp
index 2b806a3163d..7beddb93c77 100644
--- a/unittests/ADT/TripleTest.cpp
+++ b/unittests/ADT/TripleTest.cpp
@@ -352,10 +352,6 @@ TEST(TripleTest, BitWidthArchVariants) {
   EXPECT_EQ(Triple::UnknownArch, T.get32BitArchVariant().getArch());
   EXPECT_EQ(Triple::UnknownArch, T.get64BitArchVariant().getArch());
 
-  T.setArch(Triple::arm);
-  EXPECT_EQ(Triple::arm, T.get32BitArchVariant().getArch());
-  EXPECT_EQ(Triple::arm64, T.get64BitArchVariant().getArch());
-
   T.setArch(Triple::mips);
   EXPECT_EQ(Triple::mips, T.get32BitArchVariant().getArch());
   EXPECT_EQ(Triple::mips64, T.get64BitArchVariant().getArch());
-- 
2.34.1