Module Name: src
Committed By: skrll
Date: Sat Dec 21 08:58:07 UTC 2013
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
Re-enable arm-simd now that SPRSR restoration has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 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.25 src/external/mit/xorg/lib/pixman/Makefile:1.26
--- src/external/mit/xorg/lib/pixman/Makefile:1.25 Sat Sep 7 09:22:37 2013
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Dec 21 08:58:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/09/07 09:22:37 skrll Exp $
+# $NetBSD: Makefile,v 1.26 2013/12/21 08:58:07 skrll Exp $
NOLINT= 1 # defined
@@ -65,12 +65,13 @@ CPPFLAGS+= -DUSE_VMX
MKDEPFLAGS+= -maltivec
.endif
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmhf"
+
+.if !empty(MACHINE_ARCH:Mearm*)
# ARM SIMD
-#SRCS+= pixman-arm-simd.c \
-# pixman-arm-simd-asm.S \
-# pixman-arm-simd-asm-scaled.S
-#CPPFLAGS+= -DUSE_ARM_SIMD
+SRCS+= pixman-arm-simd.c \
+ pixman-arm-simd-asm.S \
+ pixman-arm-simd-asm-scaled.S
+CPPFLAGS+= -DUSE_ARM_SIMD
# ARM NEON
SRCS+= pixman-arm-neon.c \
pixman-arm-neon-asm.S \
