diff options
author | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
commit | 98fa64178af8ad608e19391053b40b0772466c64 (patch) | |
tree | 841e3eebe0277bdf98441dd45224c039e069d3b8 /pixman/configure.ac | |
parent | 405ae9defaaa03d4d305b6264a744107c3dd460d (diff) | |
parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
download | vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.gz vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.bz2 vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/include/misc.h
Diffstat (limited to 'pixman/configure.ac')
-rw-r--r-- | pixman/configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 2b9d1ba20..36f423ef7 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -351,12 +351,11 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ int main () { __m64 v = _mm_cvtsi32_si64 (1); __m64 w; - signed char x = 0; /* Some versions of clang will choke on K */ asm ("pshufw %2, %1, %0\n\t" : "=y" (w) - : "y" (v), "K" (x) + : "y" (v), "K" (5) ); return _mm_cvtsi64_si32 (v); |