summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2010-03-20 01:08:47 +0000
committerEric Christopher <echristo@apple.com>2010-03-20 01:08:47 +0000
commit33124e20c752d990ea856d007007ebf50e12922a (patch)
tree7a23a696ce5bc853c30c5633ee86da09a9c46067
parent576a9f2508d88888db690357b4fc21d8fa21911f (diff)
downloadbcm5719-llvm-33124e20c752d990ea856d007007ebf50e12922a.tar.gz
bcm5719-llvm-33124e20c752d990ea856d007007ebf50e12922a.zip
Migrate typedefs to the top level of xmmintrin.h and remove the same
one from emmintrin.h. llvm-svn: 99020
-rw-r--r--clang/lib/Headers/emmintrin.h1
-rw-r--r--clang/lib/Headers/xmmintrin.h5
2 files changed, 1 insertions, 5 deletions
diff --git a/clang/lib/Headers/emmintrin.h b/clang/lib/Headers/emmintrin.h
index fec01549edc..b09a62731ce 100644
--- a/clang/lib/Headers/emmintrin.h
+++ b/clang/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/clang/lib/Headers/xmmintrin.h b/clang/lib/Headers/xmmintrin.h
index 2f3888bebc7..06e616bd19c 100644
--- a/clang/lib/Headers/xmmintrin.h
+++ b/clang/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);
}
OpenPOWER on IntegriCloud