commit 6099914810f6f01c79e5da88794972fa4f1439c4
author Ying Wang <wangying@google.com> Mon Jan 07 13:59:36 2013 -0800
committer Ying Wang <wangying@google.com> Mon Jan 07 13:59:36 2013 -0800
tree c73440866c4cf24a1141fdb15596a9cce85e1d28
parent 6b9d7a9239479fa6d441b98e78049956052f65f9

Update renderscript to build AAQ07 #553727 in master-release.

Change-Id: Ida2f6cd58b8632297372665899ec8f24d0e04e9e

renderscript/clang-include/wmmintrin.h

diff --git a/renderscript/clang-include/wmmintrin.h b/renderscript/clang-include/wmmintrin.h
index 6b2e468..dca896f 100644
--- a/renderscript/clang-include/wmmintrin.h
+++ b/renderscript/clang-include/wmmintrin.h
@@ -24,11 +24,13 @@
 #ifndef _WMMINTRIN_H
 #define _WMMINTRIN_H
 
-#if !defined (__AES__)
-# error "AES instructions not enabled"
+#include <emmintrin.h>
+
+#if !defined (__AES__) && !defined (__PCLMUL__)
+# error "AES/PCLMUL instructions not enabled"
 #else
 
-#include <smmintrin.h>
+#ifdef __AES__
 
 static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
 _mm_aesenc_si128(__m128i __V, __m128i __R)
@@ -64,4 +66,14 @@
   __builtin_ia32_aeskeygenassist128((C), (R))
 
 #endif /* __AES__ */
+
+#ifdef __PCLMUL__
+
+#define _mm_clmulepi64_si128(__X, __Y, __I) \
+  ((__m128i)__builtin_ia32_pclmulqdq128((__v2di)(__m128i)(__X), \
+                                        (__v2di)(__m128i)(__Y), (char)(__I)))
+
+#endif /* __PCLMUL__ */
+
+#endif /* __AES__ || __PCLMUL__ */
 #endif /* _WMMINTRIN_H */