From 859fd4e418c168ff1e2550c02dd62dee78185ec0 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 23 Jan 2015 15:10:51 +0000
Subject: Don't depend on the optimizer inlining a function to get immediates
 in inline asm, clang 3.6+ explicitly checks and rejects this.

---
 x11/pixman/distinfo                          |  3 ++-
 x11/pixman/patches/patch-pixman_pixman-mmx.c | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 x11/pixman/patches/patch-pixman_pixman-mmx.c

(limited to 'x11')

diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 533725a0888..7a3be388221 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2014/07/12 14:51:04 wiz Exp $
+$NetBSD: distinfo,v 1.54 2015/01/23 15:10:51 joerg Exp $
 
 SHA1 (pixman-0.32.6.tar.bz2) = 5b730399e1e212e5acaa69a4f1a2c7be1af1cdc4
 RMD160 (pixman-0.32.6.tar.bz2) = d3bd5fef800499215944606c750696325853de2c
@@ -7,3 +7,4 @@ SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
 SHA1 (patch-bb) = d47b1857771b8addb6897d45782ba2735a7aacbd
 SHA1 (patch-bc) = 3e23e6c482ea193885f3f762af355ef2f692132b
 SHA1 (patch-bd) = 1b1432f4a88d5486afdb4c0cad0808d3748fa522
+SHA1 (patch-pixman_pixman-mmx.c) = 9ddd1bd5a691b8e86a81539fbe518c9b3a3a25ff
diff --git a/x11/pixman/patches/patch-pixman_pixman-mmx.c b/x11/pixman/patches/patch-pixman_pixman-mmx.c
new file mode 100644
index 00000000000..c9cc4f42a30
--- /dev/null
+++ b/x11/pixman/patches/patch-pixman_pixman-mmx.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-pixman_pixman-mmx.c,v 1.1 2015/01/23 15:10:51 joerg Exp $
+
+--- pixman/pixman-mmx.c.orig	2015-01-11 01:17:43.000000000 +0000
++++ pixman/pixman-mmx.c
+@@ -89,7 +89,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B)
+     return __A;
+ }
+ 
+-#  ifdef __OPTIMIZE__
++#  if defined __OPTIMIZE__ && !defined(__clang__)
+ extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
+ {
-- 
cgit v1.2.3