Migrate typedefs to the top level of xmmintrin.h and remove the same

one from emmintrin.h.

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

diff --git a/lib/Headers/emmintrin.h b/lib/Headers/emmintrin.h
index fec01549edc50d8d3d61b2373d9e02163596df74..b09a62731ce11c9e92d919de1b49cbb92b252731 100644 (file)
--- a/lib/Headers/emmintrin.h
+++ b/lib/Headers/emmintrin.h
@@ -33,7 +33,6 @@
 typedef double __m128d __attribute__((__vector_size__(16)));
 typedef long long __m128i __attribute__((__vector_size__(16)));
 
-typedef int __v4si __attribute__((__vector_size__(16)));
 typedef short __v8hi __attribute__((__vector_size__(16)));
 typedef char __v16qi __attribute__((__vector_size__(16)));
 

diff --git a/lib/Headers/xmmintrin.h b/lib/Headers/xmmintrin.h
index 2f3888bebc76774fd652e1cf374320a5f7e5b1ba..06e616bd19c25d76ea485b0129920d9e98b5c43c 100644 (file)
--- a/lib/Headers/xmmintrin.h
+++ b/lib/Headers/xmmintrin.h
@@ -30,6 +30,7 @@
 
 #include <mmintrin.h>
 
+typedef int __v4si __attribute__((__vector_size__(16)));
 typedef float __v4sf __attribute__((__vector_size__(16)));
 typedef float __m128 __attribute__((__vector_size__(16)));
 
@@ -150,28 +151,24 @@ _mm_max_ps(__m128 a, __m128 b)
 static inline __m128 __attribute__((__always_inline__, __nodebug__))
 _mm_and_ps(__m128 a, __m128 b)
 {
-  typedef int __v4si __attribute__((__vector_size__(16)));
   return (__m128)((__v4si)a & (__v4si)b);
 }
 
 static inline __m128 __attribute__((__always_inline__, __nodebug__))
 _mm_andnot_ps(__m128 a, __m128 b)
 {
-  typedef int __v4si __attribute__((__vector_size__(16)));
   return (__m128)(~(__v4si)a & (__v4si)b);
 }
 
 static inline __m128 __attribute__((__always_inline__, __nodebug__))
 _mm_or_ps(__m128 a, __m128 b)
 {
-  typedef int __v4si __attribute__((__vector_size__(16)));
   return (__m128)((__v4si)a | (__v4si)b);
 }
 
 static inline __m128 __attribute__((__always_inline__, __nodebug__))
 _mm_xor_ps(__m128 a, __m128 b)
 {
-  typedef int __v4si __attribute__((__vector_size__(16)));
   return (__m128)((__v4si)a ^ (__v4si)b);
 }