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

ok riastradh@
This commit is contained in:
rjs 2014-04-07 17:06:47 +00:00
parent 752c60b211
commit c5389c7a73

View File

@ -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_dga.c
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+= fbstipple.c
SRCS+= fbtile.c
SRCS+= fbutil.c
.endif
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
SRCS+= intel_batchbuffer.c
@ -140,12 +135,8 @@ CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
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