[src/trunk]: src/external/mit/xorg/lib/pixman Re-enable arm-simd now that SPR...

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

details:   https://anonhg.NetBSD.org/src/rev/3a2ac9ec19fb
branches:  trunk
changeset: 792115:3a2ac9ec19fb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Dec 21 08:58:07 2013 +0000

description:
Re-enable arm-simd now that SPRSR restoration has been fixed.

diffstat:

 external/mit/xorg/lib/pixman/Makefile |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (28 lines):

diff -r 0d6a29c3ffc0 -r 3a2ac9ec19fb external/mit/xorg/lib/pixman/Makefile
--- a/external/mit/xorg/lib/pixman/Makefile     Fri Dec 20 21:04:09 2013 +0000
+++ b/external/mit/xorg/lib/pixman/Makefile     Sat Dec 21 08:58:07 2013 +0000
@@ -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 @@
 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           \