diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
commit | 59d1ed5b206db2a86b3b5bb851f393c43b568ce2 (patch) | |
tree | d4426858455f04d0d8c25a2f9eb9ea5582ffe1b6 /contrib/llvm/tools/clang/lib/Headers/xmmintrin.h | |
parent | 91bc56ed825ba56b3cc264aa5c95ab84f86832ab (diff) | |
parent | 9f4dbff6669c8037f3b036bcf580d14f1a4f12a5 (diff) | |
download | src-59d1ed5b206db2a86b3b5bb851f393c43b568ce2.tar.gz src-59d1ed5b206db2a86b3b5bb851f393c43b568ce2.zip |
Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts,
and preserve our customizations, where necessary.
Notes
Notes:
svn path=/projects/clang350-import/; revision=274969
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Headers/xmmintrin.h')
-rw-r--r-- | contrib/llvm/tools/clang/lib/Headers/xmmintrin.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h b/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h index f6305fb999a7..c9befcb456f6 100644 --- a/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h +++ b/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h @@ -34,8 +34,8 @@ typedef int __v4si __attribute__((__vector_size__(16))); typedef float __v4sf __attribute__((__vector_size__(16))); typedef float __m128 __attribute__((__vector_size__(16))); -// This header should only be included in a hosted environment as it depends on -// a standard library to provide allocation routines. +/* This header should only be included in a hosted environment as it depends on + * a standard library to provide allocation routines. */ #if __STDC_HOSTED__ #include <mm_malloc.h> #endif @@ -589,7 +589,7 @@ _mm_set1_ps(float __w) return (__m128){ __w, __w, __w, __w }; } -// Microsoft specific. +/* Microsoft specific. */ static __inline__ __m128 __attribute__((__always_inline__, __nodebug__)) _mm_set_ps1(float __w) { @@ -672,10 +672,12 @@ _mm_storer_ps(float *__p, __m128 __a) #define _MM_HINT_T2 1 #define _MM_HINT_NTA 0 +#ifndef _MSC_VER /* FIXME: We have to #define this because "sel" must be a constant integer, and Sema doesn't do any form of constant propagation yet. */ #define _mm_prefetch(a, sel) (__builtin_prefetch((void *)(a), 0, (sel))) +#endif static __inline__ void __attribute__((__always_inline__, __nodebug__)) _mm_stream_pi(__m64 *__p, __m64 __a) |