From: Bradley Smith <bradley.smith@arm.com>
Date: Fri, 23 May 2014 10:14:13 +0000 (+0000)
Subject: Fixup sys::getHostCPUFeatures crypto names so it doesn't clash with kernel headers
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=fa16c880f2a4c579bc8e297846945fdefa8ce7ca;p=oota-llvm.git

Fixup sys::getHostCPUFeatures crypto names so it doesn't clash with kernel headers

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

diff --git a/lib/Support/Host.cpp b/lib/Support/Host.cpp
index 7e86e2ffcf2..fd0472ee2f7 100644
--- a/lib/Support/Host.cpp
+++ b/lib/Support/Host.cpp
@@ -718,10 +718,10 @@ bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
 #if defined(__aarch64__)
   // Keep track of which crypto features we have seen
   enum {
-    HWCAP_AES   = 0x1,
-    HWCAP_PMULL = 0x2,
-    HWCAP_SHA1  = 0x4,
-    HWCAP_SHA2  = 0x8
+    CAP_AES   = 0x1,
+    CAP_PMULL = 0x2,
+    CAP_SHA1  = 0x4,
+    CAP_SHA2  = 0x8
   };
   uint32_t crypto = 0;
 #endif
@@ -747,13 +747,13 @@ bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
     // We need to check crypto seperately since we need all of the crypto
     // extensions to enable the subtarget feature
     if (CPUFeatures[I] == "aes")
-      crypto |= HWCAP_AES;
+      crypto |= CAP_AES;
     else if (CPUFeatures[I] == "pmull")
-      crypto |= HWCAP_PMULL;
+      crypto |= CAP_PMULL;
     else if (CPUFeatures[I] == "sha1")
-      crypto |= HWCAP_SHA1;
+      crypto |= CAP_SHA1;
     else if (CPUFeatures[I] == "sha2")
-      crypto |= HWCAP_SHA2;
+      crypto |= CAP_SHA2;
 #endif
 
     if (LLVMFeatureStr != "")
@@ -762,7 +762,7 @@ bool sys::getHostCPUFeatures(StringMap<bool> &Features) {
 
 #if defined(__aarch64__)
   // If we have all crypto bits we can add the feature
-  if (crypto == (HWCAP_AES | HWCAP_PMULL | HWCAP_SHA1 | HWCAP_SHA2))
+  if (crypto == (CAP_AES | CAP_PMULL | CAP_SHA1 | CAP_SHA2))
     Features.GetOrCreateValue("crypto").setValue(true);
 #endif