Move sha intrinsics to immintrin.h

This is consistent with ICC and Intel's SHA-enabled GCC version.

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

diff --git a/lib/Headers/immintrin.h b/lib/Headers/immintrin.h
index fea7c3ba29f1c1f628442d07151d88cc8e81d1ab..15d6e05f979ad84fd6b76b9e3a93b51f8f934fdf 100644 (file)
--- a/lib/Headers/immintrin.h
+++ b/lib/Headers/immintrin.h
@@ -111,4 +111,8 @@ _xtest(void)
 }
 #endif
 
+#ifdef __SHA__
+#include <shaintrin.h>
+#endif
+
 #endif /* __IMMINTRIN_H */

diff --git a/lib/Headers/shaintrin.h b/lib/Headers/shaintrin.h
index 934b4e7c9171d3a6cc7d5d0c77857d0f321715e9..207485dd94a6af950c14147b024fe2a2088f29a0 100644 (file)
--- a/lib/Headers/shaintrin.h
+++ b/lib/Headers/shaintrin.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef __X86INTRIN_H
-#error "Never use <shaintrin.h> directly; include <x86intrin.h> instead."
+#error "Never use <shaintrin.h> directly; include <immintrin.h> instead."
 #endif
 
 #ifndef __SHAINTRIN_H

diff --git a/lib/Headers/x86intrin.h b/lib/Headers/x86intrin.h
index b0c583f899a0863384714aab91b87be49c812813..94fbe2fe234d208da6e535c7c2c23789f7e25b2d 100644 (file)
--- a/lib/Headers/x86intrin.h
+++ b/lib/Headers/x86intrin.h
@@ -70,10 +70,6 @@
 #include <f16cintrin.h>
 #endif
 
- #ifdef __SHA__
- #include <shaintrin.h>
- #endif
-
 // FIXME: LWP
 
 #endif /* __X86INTRIN_H */