[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

diff --git a/lib/Headers/immintrin.h b/lib/Headers/immintrin.h
index 6d3407f74349a51f936b6b610958655886bd77fe..59c7322e5fae75663f1aef53dce621139307e81f 100644 (file)
--- 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 ec3e3843646f0684017b3fc2b3d3a055947cc858..728c58c3ebbce0e4f0290c9ee9e79c7c7dc27209 100644 (file)
--- 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 */