[llvm] r209506 - Fixup sys::getHostCPUFeatures crypto names so it doesn't clash with kernel headers
Bradley Smith
bradley.smith at arm.com
Fri May 23 03:14:14 PDT 2014
Author: brasmi01
Date: Fri May 23 05:14:13 2014
New Revision: 209506
URL: http://llvm.org/viewvc/llvm-project?rev=209506&view=rev
Log:
Fixup sys::getHostCPUFeatures crypto names so it doesn't clash with kernel headers
Modified:
llvm/trunk/lib/Support/Host.cpp
Modified: llvm/trunk/lib/Support/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Host.cpp?rev=209506&r1=209505&r2=209506&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Host.cpp (original)
+++ llvm/trunk/lib/Support/Host.cpp Fri May 23 05:14:13 2014
@@ -718,10 +718,10 @@ bool sys::getHostCPUFeatures(StringMap<b
#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<b
// 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<b
#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
More information about the llvm-commits
mailing list