Date: Wed, 4 Feb 2015 22:06:58 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378423 - head/x11/pixman/files Message-ID: <201502042206.t14M6wCh088181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Wed Feb 4 22:06:57 2015 New Revision: 378423 URL: https://svnweb.freebsd.org/changeset/ports/378423 QAT: https://qat.redports.org/buildarchive/r378423/ Log: Unfumble the patch to fix the build with clang 3.6. Noticed by: dim@ doing clang 3.6 tests. Modified: head/x11/pixman/files/patch-pixman_pixman-mmx.c Modified: head/x11/pixman/files/patch-pixman_pixman-mmx.c ============================================================================== --- head/x11/pixman/files/patch-pixman_pixman-mmx.c Wed Feb 4 21:00:49 2015 (r378422) +++ head/x11/pixman/files/patch-pixman_pixman-mmx.c Wed Feb 4 22:06:57 2015 (r378423) @@ -5,17 +5,14 @@ https://bugs.freebsd.org/bugzilla/show_b http://llvm.org/viewvc/llvm-project?view=revision&revision=225244 http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20150112/121309.html ---- files/patch-pixman__pixman-mmx.c (revision 0) -+++ files/patch-pixman__pixman-mmx.c (working copy) -@@ -0,0 +1,11 @@ -+--- pixman/pixman-mmx.c.orig 2014-04-24 08:34:14.000000000 +0400 -++++ pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300 -+@@ -89,7 +89,7 @@ -+ return __A; -+ } -+ -+-# ifdef __OPTIMIZE__ -++# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6) -+ extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -+ _mm_shuffle_pi16 (__m64 __A, int8_t const __N) -+ { +--- pixman/pixman-mmx.c.orig 2014-04-24 08:34:14.000000000 +0400 ++++ pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300 +@@ -89,7 +89,7 @@ + return __A; + } + +-# ifdef __OPTIMIZE__ ++# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6) + extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_shuffle_pi16 (__m64 __A, int8_t const __N) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502042206.t14M6wCh088181>