pixman: Branch 'master'

[Alan Coopersmith]

 pixman/pixman-mmx.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 85943733cbd7b62991ee962aa22f28bc5d1be353
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Feb 24 18:02:56 2012 -0800

    Just use xmmintrin.h when building with Solaris Studio compilers
    
    Since the Solaris Studio compilers don't have a mode where MMX
    instructions are available and SSE instructions are not, we can
    just use the <xmmintrin.h> header directly.
    
    Fixes build failure due to Studio not supporting the __gnu_inline__
    or __artificial__ attributes.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Acked-by: Matt Turner <mattst88 at gmail.com>

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index bd44f63..fe31b08 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -57,6 +57,9 @@ _mm_empty (void)
 #endif
 
 #ifdef USE_X86_MMX
+# ifdef __SUNPRO_C
+#  include <xmmintrin.h>
+# else
 /* We have to compile with -msse to use xmmintrin.h, but that causes SSE
  * instructions to be generated that we don't want. Just duplicate the
  * functions we want to use.  */
@@ -82,6 +85,7 @@ _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
 
     return ret;
 }
+# endif
 #endif
 
 #define _MM_SHUFFLE(fp3,fp2,fp1,fp0) \