pixman: Branch 'master'

[Matt Turner]

 pixman/pixman-mmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 183afcf1d95625a1f237ef349a1c8931d94d000d
Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Sep 30 11:59:23 2012 -0700

    iwmmxt: Don't define dummy _mm_empty for >=gcc-4.8
    
    Definition was not present in <4.8.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55451

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index fccba9d..1e6dbe8 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -52,7 +52,7 @@
 #define CHECKPOINT()
 #endif
 
-#ifdef USE_ARM_IWMMXT
+#if defined USE_ARM_IWMMXT && __GNUC__ == 4 && __GNUC_MINOR__ < 8
 /* Empty the multimedia state. For some reason, ARM's mmintrin.h doesn't provide this.  */
 extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
 _mm_empty (void)