summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@intel.com>2018-05-23 21:04:26 +0000
committerCraig Topper <craig.topper@intel.com>2018-05-23 21:04:26 +0000
commit54f3f9c02f9c7b4f1d0046584421b08f21367702 (patch)
tree396b62ca538a7d7cb89200d07252a00f2237e5db
parent611c44748fecd28200fda7509eb9a1d6fa243b2b (diff)
[X86] Move the include of clzerointrin.h from immintrin.h back to x86intrin.h.
This is an AMD intrinsic not an Intel intrinsic so it shouldn't be in immintrin.h git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@333124 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Headers/immintrin.h4
-rw-r--r--lib/Headers/x86intrin.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/Headers/immintrin.h b/lib/Headers/immintrin.h
index 6d3407f743..59c7322e5f 100644
--- a/lib/Headers/immintrin.h
+++ b/lib/Headers/immintrin.h
@@ -347,10 +347,6 @@ _writegsbase_u64(unsigned long long __V)
#include <rdseedintrin.h>
#endif
-#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLZERO__)
-#include <clzerointrin.h>
-#endif
-
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WBNOINVD__)
#include <wbnoinvdintrin.h>
#endif
diff --git a/lib/Headers/x86intrin.h b/lib/Headers/x86intrin.h
index ec3e384364..728c58c3eb 100644
--- a/lib/Headers/x86intrin.h
+++ b/lib/Headers/x86intrin.h
@@ -60,4 +60,9 @@
#include <mwaitxintrin.h>
#endif
+#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLZERO__)
+#include <clzerointrin.h>
+#endif
+
+
#endif /* __X86INTRIN_H */