Module Name: src
Committed By: mrg
Date: Mon Mar 17 01:41:46 UTC 2014
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
updates for pixman 0.32.4 and x86.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.27 src/external/mit/xorg/lib/pixman/Makefile:1.28
--- src/external/mit/xorg/lib/pixman/Makefile:1.27 Thu Jan 30 19:24:06 2014
+++ src/external/mit/xorg/lib/pixman/Makefile Mon Mar 17 01:41:46 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/01/30 19:24:06 riz Exp $
+# $NetBSD: Makefile,v 1.28 2014/03/17 01:41:46 mrg Exp $
NOLINT= 1 # defined
@@ -45,20 +45,21 @@ SRCS+= \
# XXX
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+. if ${MACHINE_ARCH} == "i386"
SRCS+= pixman-mmx.c
COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
-. if defined(HAVE_LLVM)
+. if defined(HAVE_LLVM)
COPTS.pixman-mmx.c+= -Wno-error=attributes
+. endif
+CPPFLAGS+= -DUSE_X86_MMX
+MKDEPFLAGS+= -mmmx
. endif
-MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden
-SRCS+= pixman-sse2.c
+SRCS+= pixman-sse2.c pixman-ssse3.c
COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
-CPPFLAGS+= -DUSE_SSE2 -DUSE_X86_MMX
-.elif ${MACHINE_ARCH} == "x86_64"
-SRCS+= pixman-sse2.c
-COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
-CPPFLAGS+= -DUSE_SSE2
+COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
+CPPFLAGS+= -DUSE_SSE2 -DUSE_SSE3
+MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden
.endif
.if ${MACHINE_ARCH} == "powerpc"
@@ -68,7 +69,6 @@ CPPFLAGS+= -DUSE_VMX
MKDEPFLAGS+= -maltivec
.endif
-
.if !empty(MACHINE_ARCH:Mearm*)
# ARM SIMD
SRCS+= pixman-arm-simd.c \
