Module Name: src
Committed By: martin
Date: Mon Dec 19 12:06:56 UTC 2022
Modified Files:
src/external/mit/xorg/lib/pixman [netbsd-10]: Makefile Makefile.cflags
Log Message:
Pull up following revision(s) (requested by mrg in ticket #5):
external/mit/xorg/lib/pixman/Makefile.cflags: revision 1.2
external/mit/xorg/lib/pixman/Makefile: revision 1.42
handle pixman revert.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/external/mit/xorg/lib/pixman/Makefile.cflags
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.41 src/external/mit/xorg/lib/pixman/Makefile:1.41.2.1
--- src/external/mit/xorg/lib/pixman/Makefile:1.41 Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile Mon Dec 19 12:06:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/11/13 09:36:37 mrg Exp $
+# $NetBSD: Makefile,v 1.41.2.1 2022/12/19 12:06:56 martin Exp $
NOLINT= 1 # defined
@@ -88,12 +88,13 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
+# XXX not yet; new pixman bad on arm64.
# ARM64 NEON
-SRCS+= pixman-arm-neon.c \
- pixman-arma64-neon-asm.S \
- pixman-arma64-neon-asm-bilinear.S
-CPPFLAGS+= -DUSE_ARM_A64_NEON
-
+#SRCS+= pixman-arm-neon.c \
+# pixman-arma64-neon-asm.S \
+# pixman-arma64-neon-asm-bilinear.S
+#CPPFLAGS+= -DUSE_ARM_A64_NEON
+#
# XXX: not sure if needed?
#AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
.endif
Index: src/external/mit/xorg/lib/pixman/Makefile.cflags
diff -u src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1.2.1
--- src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1 Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile.cflags Mon Dec 19 12:06:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cflags,v 1.1 2022/11/13 09:36:37 mrg Exp $
+# $NetBSD: Makefile.cflags,v 1.1.2.1 2022/12/19 12:06:56 martin Exp $
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
. if ${MACHINE_ARCH} == "i386"
@@ -18,7 +18,7 @@ CPPFLAGS+= -DUSE_ARM_NEON
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
-CPPFLAGS+= -DUSE_ARM_A64_NEON
+#CPPFLAGS+= -DUSE_ARM_A64_NEON
.endif
.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
