From 1ed7896c1b656276bc3b495ecbca3096dd5781ab Mon Sep 17 00:00:00 2001
From: Ivan Krasin <krasin@chromium.org>
Date: Fri, 13 Jan 2017 16:45:15 +0000
Subject: Revert r291903 and r291898. Reason: they break check-lld on the bots.

Summary:
Revert [ARM] Fix ubig32_t read in ARMAttributeParser

Now using support functions to read data instead of trying to
perform casts.
===========================================================

Revert [ARM] Enable objdump to construct triple for ARM

Now that The ARMAttributeParser has been moved into the library,
it has been modified so that it can parse the attributes without
printing them and stores them in a map. ELFObjectFile now queries
the attributes to fill out the architecture details of a provided
triple for 'arm' and 'thumb' targets. llvm-objdump uses this new
functionality.

Subscribers: llvm-commits, samparker, aemerson, mgorny

Differential Revision: https://reviews.llvm.org/D28683

llvm-svn: 291911
---
 llvm/lib/Object/ELFObjectFile.cpp | 65 ---------------------------------------
 1 file changed, 65 deletions(-)

(limited to 'llvm/lib/Object/ELFObjectFile.cpp')

diff --git a/llvm/lib/Object/ELFObjectFile.cpp b/llvm/lib/Object/ELFObjectFile.cpp
index d33da47d6cb..4bd69e34e3c 100644
--- a/llvm/lib/Object/ELFObjectFile.cpp
+++ b/llvm/lib/Object/ELFObjectFile.cpp
@@ -122,69 +122,4 @@ SubtargetFeatures ELFObjectFileBase::getFeatures() const {
   }
 }
 
-// FIXME Encode from a tablegen description or target parser.
-void ELFObjectFileBase::setARMSubArch(Triple &TheTriple) const {
-  if (TheTriple.getSubArch() != Triple::NoSubArch)
-    return;
-
-  ARMAttributeParser Attributes;
-  std::error_code EC = getBuildAttributes(Attributes);
-  if (EC)
-    return;
-
-  std::string Triple;
-  // Default to ARM, but use the triple if it's been set.
-  if (TheTriple.getArch() == Triple::thumb ||
-      TheTriple.getArch() == Triple::thumbeb)
-    Triple = "thumb";
-  else
-    Triple = "arm";
-
-  switch(Attributes.getAttributeValue(ARMBuildAttrs::CPU_arch)) {
-  case ARMBuildAttrs::v4:
-    Triple += "v4";
-    break;
-  case ARMBuildAttrs::v4T:
-    Triple += "v4t";
-    break;
-  case ARMBuildAttrs::v5T:
-    Triple += "v5t";
-    break;
-  case ARMBuildAttrs::v5TE:
-    Triple += "v5te";
-    break;
-  case ARMBuildAttrs::v5TEJ:
-    Triple += "v5tej";
-    break;
-  case ARMBuildAttrs::v6:
-    Triple += "v6";
-    break;
-  case ARMBuildAttrs::v6KZ:
-    Triple += "v6kz";
-    break;
-  case ARMBuildAttrs::v6T2:
-    Triple += "v6t2";
-    break;
-  case ARMBuildAttrs::v6K:
-    Triple += "v6k";
-    break;
-  case ARMBuildAttrs::v7:
-    Triple += "v7";
-    break;
-  case ARMBuildAttrs::v6_M:
-    Triple += "v6m";
-    break;
-  case ARMBuildAttrs::v6S_M:
-    Triple += "v6sm";
-    break;
-  case ARMBuildAttrs::v7E_M:
-    Triple += "v7em";
-    break;
-  }
-  if (!isLittleEndian())
-    Triple += "eb";
-
-  TheTriple.setArchName(Triple);
-}
-
 } // end namespace llvm
-- 
cgit v1.2.3