diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /pixman | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 2 | ||||
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 1cf9eb4e5..56ef10ebf 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -565,7 +565,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #ifndef __arm__ #error "IWMMXT is only available on ARM" #endif -#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)) +#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)) #error "Need GCC >= 4.6 for IWMMXT intrinsics" #endif #include <mmintrin.h> diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index 72cbddb2c..2a72efaac 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -73,6 +73,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B) return __A; } +# ifdef __OPTIMIZE__ extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) _mm_shuffle_pi16 (__m64 __A, int8_t const __N) { @@ -85,6 +86,10 @@ _mm_shuffle_pi16 (__m64 __A, int8_t const __N) return ret; } +# else +# define _mm_shuffle_pi16(A, N) \ + ((__m64) __builtin_ia32_pshufw ((__v4hi)(__m64)(A), (int)(N))) +# endif # endif #ifndef _MSC_VER |