[src/trunk]: src/external/mit/xorg/server/drivers/xf86-video-intel Skip SNA o...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d8e3f841e30
branches:  trunk
changeset: 328452:1d8e3f841e30
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Apr 03 18:17:52 2014 +0000

description:
Skip SNA on i386 for now, since it triggers a GCC ICE.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-intel/Makefile |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 4e4990b0b97a -r 1d8e3f841e30 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Thu Apr 03 17:14:41 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Thu Apr 03 18:17:52 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2014/04/03 02:51:20 riastradh Exp $
+#      $NetBSD: Makefile,v 1.13 2014/04/03 18:17:52 riastradh Exp $
 
 .include <bsd.own.mk>
 
@@ -24,6 +24,9 @@
 SRCS+=         i810_dri.c
 SRCS+=         i810_hwmc.c
 
+# SNA is amd64-only for now -- triggers ICEs on i386.
+.if ${MACHINE_ARCH} != "i386"
+
 # sna
 .PATH: ${X11SRCDIR.${DRIVER}}/src/sna
 SRCS+=         blt.c
@@ -93,6 +96,8 @@
 SRCS+=         fbtile.c
 SRCS+=         fbutil.c
 
+.endif
+
 # uxa
 .PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
 SRCS+=         intel_batchbuffer.c
@@ -134,9 +139,13 @@
 CPPFLAGS+=     -DHAVE_ATOMIC_PRIMITIVES
 
 CPPFLAGS+=     -DENABLE_XVMC
+CPPFLAGS+=     -DUSE_UXA
+.if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+=     -DDEFAULT_ACCEL_METHOD=UXA
+.else
 CPPFLAGS+=     -DUSE_SNA
-CPPFLAGS+=     -DUSE_UXA
 CPPFLAGS+=     -DDEFAULT_ACCEL_METHOD=SNA
+.endif
 
 CPPFLAGS+=     -DHAVE_DRI1
 CPPFLAGS+=     -DHAVE_DRI2_H