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

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

details:   https://anonhg.NetBSD.org/src/rev/b4aeea83ee2b
branches:  trunk
changeset: 328566:b4aeea83ee2b
user:      rjs <rjs%NetBSD.org@localhost>
date:      Mon Apr 07 17:06:47 2014 +0000

description:
The SNA code builds with gcc 4.8 on i386 so enable it again.

ok riastradh@

diffstat:

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

diffs (41 lines):

diff -r 06eb91a2ba08 -r b4aeea83ee2b external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Mon Apr 07 17:02:15 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Mon Apr 07 17:06:47 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2014/04/03 18:17:52 riastradh Exp $
+#      $NetBSD: Makefile,v 1.14 2014/04/07 17:06:47 rjs Exp $
 
 .include <bsd.own.mk>
 
@@ -24,9 +24,6 @@
 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
@@ -96,8 +93,6 @@
 SRCS+=         fbtile.c
 SRCS+=         fbutil.c
 
-.endif
-
 # uxa
 .PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
 SRCS+=         intel_batchbuffer.c
@@ -140,12 +135,8 @@
 
 CPPFLAGS+=     -DENABLE_XVMC
 CPPFLAGS+=     -DUSE_UXA
-.if ${MACHINE_ARCH} == "i386"
-CPPFLAGS+=     -DDEFAULT_ACCEL_METHOD=UXA
-.else
 CPPFLAGS+=     -DUSE_SNA
 CPPFLAGS+=     -DDEFAULT_ACCEL_METHOD=SNA
-.endif
 
 CPPFLAGS+=     -DHAVE_DRI1
 CPPFLAGS+=     -DHAVE_DRI2_H