diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-16 11:30:08 +0200 |
| commit | 56e12b1310b1b52d00bc27e919d915255af5bf03 (patch) | |
| tree | 19379a18fe9a678a109397837339820892101e4b /pixman/configure.ac | |
| parent | c5883f8af060c0a300a29e732e8bb893bc8e0eca (diff) | |
| parent | 9e23b44bfe1e6e85231b1c07d945cadf0c868648 (diff) | |
| download | vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.gz vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.bz2 vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/drisw_util.c
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 2dd477663..8a3b62268 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -183,6 +183,7 @@ AC_SUBST(LT_VERSION_INFO) # Check for dependencies PIXMAN_CHECK_CFLAG([-Wall]) +PIXMAN_CHECK_CFLAG([-Wdeclaration-after-statement]) PIXMAN_CHECK_CFLAG([-fno-strict-aliasing]) dnl ========================================================================= @@ -355,6 +356,12 @@ int main () { : "y" (v), "K" (5) ); + /* Some versions of clang will choke on this */ + asm ("pmulhuw %1, %0\n\t" + : "+y" (w) + : "y" (v) + ); + return _mm_cvtsi64_si32 (v); }]])], have_mmx_intrinsics=yes) CFLAGS=$xserver_save_CFLAGS |