r191002 - Move sha intrinsics to immintrin.h

[Ben Langmuir]

Author: benlangmuir
Date: Thu Sep 19 09:00:22 2013
New Revision: 191002

URL: http://llvm.org/viewvc/llvm-project?rev=191002&view=rev
Log:
Move sha intrinsics to immintrin.h

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

Modified:
    cfe/trunk/lib/Headers/immintrin.h
    cfe/trunk/lib/Headers/shaintrin.h
    cfe/trunk/lib/Headers/x86intrin.h

Modified: cfe/trunk/lib/Headers/immintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/immintrin.h?rev=191002&r1=191001&r2=191002&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/immintrin.h (original)
+++ cfe/trunk/lib/Headers/immintrin.h Thu Sep 19 09:00:22 2013
@@ -111,4 +111,8 @@ _xtest(void)
 }
 #endif
 
+#ifdef __SHA__
+#include <shaintrin.h>
+#endif
+
 #endif /* __IMMINTRIN_H */

Modified: cfe/trunk/lib/Headers/shaintrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/shaintrin.h?rev=191002&r1=191001&r2=191002&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/shaintrin.h (original)
+++ cfe/trunk/lib/Headers/shaintrin.h Thu Sep 19 09:00:22 2013
@@ -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

Modified: cfe/trunk/lib/Headers/x86intrin.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/x86intrin.h?rev=191002&r1=191001&r2=191002&view=diff
==============================================================================
--- cfe/trunk/lib/Headers/x86intrin.h (original)
+++ cfe/trunk/lib/Headers/x86intrin.h Thu Sep 19 09:00:22 2013
@@ -70,10 +70,6 @@
 #include <f16cintrin.h>
 #endif
 
- #ifdef __SHA__
- #include <shaintrin.h>
- #endif
-
 // FIXME: LWP
 
 #endif /* __X86INTRIN_H */