diff options
| author | Bradley Smith <bradley.smith@arm.com> | 2014-05-23 10:14:13 +0000 |
|---|---|---|
| committer | Bradley Smith <bradley.smith@arm.com> | 2014-05-23 10:14:13 +0000 |
| commit | 63c8b1bcb31acc80135ad3861cb14f558a22be5c (patch) | |
| tree | 56e9d3d335d952b751e13d8a03c94581868ec444 /llvm/lib/Support/Host.cpp | |
| parent | 39f9f726bcc27f8f125cc8078d33f818b2d54eee (diff) | |
| download | llvm-63c8b1bcb31acc80135ad3861cb14f558a22be5c.zip llvm-63c8b1bcb31acc80135ad3861cb14f558a22be5c.tar.gz llvm-63c8b1bcb31acc80135ad3861cb14f558a22be5c.tar.bz2 | |
Fixup sys::getHostCPUFeatures crypto names so it doesn't clash with kernel headers
llvm-svn: 209506
Diffstat (limited to 'llvm/lib/Support/Host.cpp')
| -rw-r--r-- | llvm/lib/Support/Host.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp index 7e86e2ff..fd0472e 100644 --- a/llvm/lib/Support/Host.cpp +++ b/llvm/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 |