From: Ben Langmuir <ben.langmuir@intel.com>
Date: Thu, 19 Sep 2013 14:00:22 +0000 (+0000)
Subject: Move sha intrinsics to immintrin.h
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e130d037f1f68438306ea136655fffc11a34031;p=clang

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 fea7c3ba29..15d6e05f97 100644
--- 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 934b4e7c91..207485dd94 100644
--- 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 b0c583f899..94fbe2fe23 100644
--- 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 */