CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: christos Date: Mon Apr 26 21:32:49 UTC 2021 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Don't try to override an existing -march To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 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.37 src/external/mit/xorg/lib/pixman/Makefile:1.38 --- src/external/mit/xorg/lib/pixman/Makefile:1.37 Sun Apr 25 19:23:19 2021 +++ src/external/mit/xorg/lib/pixman/Makefile Mon Apr 26 17:32:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $ +# $NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $ NOLINT= 1 # defined @@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f #CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -.if !empty(MACHINE_ARCH:Mmips*64el) +.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*) # Loongson MMI SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: christos Date: Sun Apr 25 23:23:19 UTC 2021 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: handle mipsn64el To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 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.36 src/external/mit/xorg/lib/pixman/Makefile:1.37 --- src/external/mit/xorg/lib/pixman/Makefile:1.36 Tue Sep 15 01:14:19 2020 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Apr 25 19:23:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2020/09/15 05:14:19 mrg Exp $ +# $NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $ NOLINT= 1 # defined @@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f #CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -.if ${MACHINE_ARCH} == "mips64el" +.if !empty(MACHINE_ARCH:Mmips*64el) # Loongson MMI SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Tue Sep 15 05:14:19 UTC 2020 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: avoid ICE on sh3. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 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.35 src/external/mit/xorg/lib/pixman/Makefile:1.36 --- src/external/mit/xorg/lib/pixman/Makefile:1.35 Wed Mar 30 16:19:06 2016 +++ src/external/mit/xorg/lib/pixman/Makefile Tue Sep 15 05:14:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2016/03/30 16:19:06 macallan Exp $ +# $NetBSD: Makefile,v 1.36 2020/09/15 05:14:19 mrg Exp $ NOLINT= 1 # defined @@ -98,6 +98,11 @@ CPPFLAGS+= -DUSE_LOONGSON_MMI COPTS.pixman-mmx.c= -march=loongson2f -mhard-float -Wa,-mhard-float .endif +.if ${MACHINE_CPU} == "sh3" +# XXX pixman-fast-path.c:1204:1: internal compiler error: Segmentation fault +COPTS.pixman-fast-path.c+= -O1 +.endif + INCS= pixman.h pixman-version.h INCSDIR=${X11INCDIR}/pixman-1
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: macallan Date: Wed Mar 30 16:19:06 UTC 2016 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Loongson MMI code needs -Wa,-mhard-float now To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 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.34 src/external/mit/xorg/lib/pixman/Makefile:1.35 --- src/external/mit/xorg/lib/pixman/Makefile:1.34 Sat Nov 7 20:45:03 2015 +++ src/external/mit/xorg/lib/pixman/Makefile Wed Mar 30 16:19:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/11/07 20:45:03 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.35 2016/03/30 16:19:06 macallan Exp $ NOLINT= 1 # defined @@ -95,7 +95,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI # SIMD instructions use floatpoint registers so we need to enable their use -COPTS.pixman-mmx.c= -march=loongson2f -mhard-float +COPTS.pixman-mmx.c= -march=loongson2f -mhard-float -Wa,-mhard-float .endif INCS= pixman.h pixman-version.h
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: szptvlfn Date: Sat Nov 7 20:45:03 UTC 2015 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: change MKDEPFLAGS from -msse2 -mssse3 -mssse3 -fvisibility=hidden to -msse2 -msse3 -mssse3 -fvisibility=hidden OK dholland@ at tech-x11@ To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 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.33 src/external/mit/xorg/lib/pixman/Makefile:1.34 --- src/external/mit/xorg/lib/pixman/Makefile:1.33 Fri Nov 6 21:32:22 2015 +++ src/external/mit/xorg/lib/pixman/Makefile Sat Nov 7 20:45:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2015/11/06 21:32:22 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.34 2015/11/07 20:45:03 szptvlfn Exp $ NOLINT= 1 # defined @@ -61,7 +61,7 @@ SRCS+= pixman-sse2.c pixman-ssse3.c COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3 -MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden +MKDEPFLAGS+= -msse2 -msse3 -mssse3 -fvisibility=hidden .endif .if ${MACHINE_ARCH} == "powerpc"
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: macallan Date: Sat May 2 14:54:18 UTC 2015 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: build Loongson-MMI support only on mips64el To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 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.31 src/external/mit/xorg/lib/pixman/Makefile:1.32 --- src/external/mit/xorg/lib/pixman/Makefile:1.31 Sun Aug 10 19:11:08 2014 +++ src/external/mit/xorg/lib/pixman/Makefile Sat May 2 14:54:18 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/08/10 19:11:08 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2015/05/02 14:54:18 macallan Exp $ NOLINT= 1 # defined @@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == clang :? -f #CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -.if ${MACHINE} == evbmips +.if ${MACHINE_ARCH} == mips64el # Loongson MMI SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: jmcneill Date: Sun Aug 10 14:10:38 UTC 2014 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: USE_SSSE3 not USE_SSE3 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 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.29 src/external/mit/xorg/lib/pixman/Makefile:1.30 --- src/external/mit/xorg/lib/pixman/Makefile:1.29 Sat Jul 12 04:32:59 2014 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Aug 10 14:10:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/07/12 04:32:59 mrg Exp $ +# $NetBSD: Makefile,v 1.30 2014/08/10 14:10:37 jmcneill Exp $ NOLINT= 1 # defined @@ -60,7 +60,7 @@ MKDEPFLAGS+= -mmmx SRCS+= pixman-sse2.c pixman-ssse3.c COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden -CPPFLAGS+= -DUSE_SSE2 -DUSE_SSE3 +CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3 MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden .endif
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: joerg Date: Sun Aug 10 19:11:08 UTC 2014 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: This is unlikely to ever work with LLVM's IAS due to the amount of macro use. Disable it on ARM. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 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.30 src/external/mit/xorg/lib/pixman/Makefile:1.31 --- src/external/mit/xorg/lib/pixman/Makefile:1.30 Sun Aug 10 14:10:37 2014 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Aug 10 19:11:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/08/10 14:10:37 jmcneill Exp $ +# $NetBSD: Makefile,v 1.31 2014/08/10 19:11:08 joerg Exp $ NOLINT= 1 # defined @@ -82,6 +82,8 @@ SRCS+= pixman-arm-neon.c \ pixman-arm-neon-asm.S \ pixman-arm-neon-asm-bilinear.S CPPFLAGS+= -DUSE_ARM_NEON + +AFLAGS+= ${${ACTIVE_CC} == clang :? -fno-integrated-as :} # ARM iwMMX #SRCS+= pixman-mmx.c #COPTS.pixman-mmx.c= -mcpu=iwmmxt
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Sat Jul 12 04:32:59 UTC 2014 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: note about missing HAVE_GCC_VECTOR_EXTENSIONS (only used in test apps). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 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.28 src/external/mit/xorg/lib/pixman/Makefile:1.29 --- src/external/mit/xorg/lib/pixman/Makefile:1.28 Mon Mar 17 01:41:46 2014 +++ src/external/mit/xorg/lib/pixman/Makefile Sat Jul 12 04:32:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/03/17 01:41:46 mrg Exp $ +# $NetBSD: Makefile,v 1.29 2014/07/12 04:32:59 mrg Exp $ NOLINT= 1 # defined @@ -45,6 +45,8 @@ SRCS+= \ # XXX +# missing: HAVE_GCC_VECTOR_EXTENSIONS + .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 . if ${MACHINE_ARCH} == i386 SRCS+= pixman-mmx.c
CVS commit: src/external/mit/xorg/lib/pixman
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 \
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: riz Date: Thu Jan 30 19:24:06 UTC 2014 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Turn off attribute warning errors for clang in pixman-mmx.c (__artificial__). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 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.26 src/external/mit/xorg/lib/pixman/Makefile:1.27 --- src/external/mit/xorg/lib/pixman/Makefile:1.26 Sat Dec 21 08:58:07 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Jan 30 19:24:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/12/21 08:58:07 skrll Exp $ +# $NetBSD: Makefile,v 1.27 2014/01/30 19:24:06 riz Exp $ NOLINT= 1 # defined @@ -48,6 +48,9 @@ SRCS+= \ .if ${MACHINE_ARCH} == i386 SRCS+= pixman-mmx.c COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden +. if defined(HAVE_LLVM) +COPTS.pixman-mmx.c+= -Wno-error=attributes +. endif MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden SRCS+= pixman-sse2.c COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
CVS commit: src/external/mit/xorg/lib/pixman
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 \
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: skrll Date: Sat Sep 7 09:22:37 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Disable USE_ARM_SIMD for now. It crashes Xorg. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 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.24 src/external/mit/xorg/lib/pixman/Makefile:1.25 --- src/external/mit/xorg/lib/pixman/Makefile:1.24 Wed Jun 5 09:04:16 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Sat Sep 7 09:22:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/06/05 09:04:16 mrg Exp $ +# $NetBSD: Makefile,v 1.25 2013/09/07 09:22:37 skrll Exp $ NOLINT= 1 # defined @@ -67,10 +67,10 @@ MKDEPFLAGS+= -maltivec .if ${MACHINE_ARCH} == earm || ${MACHINE_ARCH} == earmhf # 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 \
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Wed Jun 5 09:04:16 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile shlib_version Log Message: add new files for pixman 0.30.0. bump minor. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/pixman/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/pixman/shlib_version 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.23 src/external/mit/xorg/lib/pixman/Makefile:1.24 --- src/external/mit/xorg/lib/pixman/Makefile:1.23 Tue May 7 07:01:37 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Wed Jun 5 09:04:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/05/07 07:01:37 martin Exp $ +# $NetBSD: Makefile,v 1.24 2013/06/05 09:04:16 mrg Exp $ NOLINT= 1 # defined @@ -17,13 +17,10 @@ SRCS= \ pixman-combine32.c \ pixman-combine-float.c \ pixman-conical-gradient.c \ - pixman-x86.c \ - pixman-mips.c \ - pixman-arm.c \ - pixman-ppc.c \ pixman-edge.c \ pixman-edge-accessors.c \ pixman-fast-path.c \ + pixman-filter.c \ pixman-glyph.c \ pixman-general.c \ pixman-gradient-walker.c \ @@ -40,6 +37,12 @@ SRCS= \ pixman-trap.c \ pixman-utils.c +SRCS+= \ + pixman-x86.c \ + pixman-mips.c \ + pixman-arm.c \ + pixman-ppc.c \ + # XXX .if ${MACHINE_ARCH} == i386 @@ -65,7 +68,8 @@ MKDEPFLAGS+= -maltivec .if ${MACHINE_ARCH} == earm || ${MACHINE_ARCH} == earmhf # ARM SIMD SRCS+= pixman-arm-simd.c \ - pixman-arm-simd-asm.S + pixman-arm-simd-asm.S \ + pixman-arm-simd-asm-scaled.S CPPFLAGS+= -DUSE_ARM_SIMD # ARM NEON SRCS+= pixman-arm-neon.c \ Index: src/external/mit/xorg/lib/pixman/shlib_version diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.5 src/external/mit/xorg/lib/pixman/shlib_version:1.6 --- src/external/mit/xorg/lib/pixman/shlib_version:1.5 Sun May 23 04:26:19 2010 +++ src/external/mit/xorg/lib/pixman/shlib_version Wed Jun 5 09:04:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.5 2010/05/23 04:26:19 mrg Exp $ +# $NetBSD: shlib_version,v 1.6 2013/06/05 09:04:16 mrg Exp $ # major=2 -minor=1 +minor=2
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: martin Date: Tue May 7 07:01:39 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Enable SSE2 support for i386 - the -current compiler seems to get the alignment right. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 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.22 src/external/mit/xorg/lib/pixman/Makefile:1.23 --- src/external/mit/xorg/lib/pixman/Makefile:1.22 Thu May 2 21:40:57 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Tue May 7 07:01:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/05/02 21:40:57 skrll Exp $ +# $NetBSD: Makefile,v 1.23 2013/05/07 07:01:37 martin Exp $ NOLINT= 1 # defined @@ -43,10 +43,12 @@ SRCS= \ # XXX .if ${MACHINE_ARCH} == i386 -# SSE2 does not work, for unknown reasons SRCS+= pixman-mmx.c COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden -MKDEPFLAGS+= -mmmx -fvisibility=hidden +MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden +SRCS+= pixman-sse2.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
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: skrll Date: Thu May 2 21:40:58 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Comment out iwmmxt. hi jared. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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.21 src/external/mit/xorg/lib/pixman/Makefile:1.22 --- src/external/mit/xorg/lib/pixman/Makefile:1.21 Thu Feb 28 12:40:47 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Thu May 2 21:40:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/02/28 12:40:47 macallan Exp $ +# $NetBSD: Makefile,v 1.22 2013/05/02 21:40:57 skrll Exp $ NOLINT= 1 # defined @@ -71,9 +71,9 @@ SRCS+= pixman-arm-neon.c \ pixman-arm-neon-asm-bilinear.S CPPFLAGS+= -DUSE_ARM_NEON # ARM iwMMX -SRCS+= pixman-mmx.c -COPTS.pixman-mmx.c= -mcpu=iwmmxt -CPPFLAGS+= -DUSE_ARM_IWMMXT +#SRCS+= pixman-mmx.c +#COPTS.pixman-mmx.c= -mcpu=iwmmxt +#CPPFLAGS+= -DUSE_ARM_IWMMXT .endif .if ${MACHINE} == evbmips
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: macallan Date: Thu Feb 28 12:40:48 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: build support for Loongson Multimedia Instructions on evbmips To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 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.20 src/external/mit/xorg/lib/pixman/Makefile:1.21 --- src/external/mit/xorg/lib/pixman/Makefile:1.20 Mon Feb 11 09:26:07 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Feb 28 12:40:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/02/11 09:26:07 martin Exp $ +# $NetBSD: Makefile,v 1.21 2013/02/28 12:40:47 macallan Exp $ NOLINT= 1 # defined @@ -76,6 +76,14 @@ COPTS.pixman-mmx.c= -mcpu=iwmmxt CPPFLAGS+= -DUSE_ARM_IWMMXT .endif +.if ${MACHINE} == evbmips +# Loongson MMI +SRCS+= pixman-mmx.c +CPPFLAGS+= -DUSE_LOONGSON_MMI +# SIMD instructions use floatpoint registers so we need to enable their use +COPTS.pixman-mmx.c= -march=loongson2f -mhard-float +.endif + INCS= pixman.h pixman-version.h INCSDIR=${X11INCDIR}/pixman-1
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: martin Date: Mon Feb 11 09:26:07 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Enable SSE2 support for amd64 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 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.19 src/external/mit/xorg/lib/pixman/Makefile:1.20 --- src/external/mit/xorg/lib/pixman/Makefile:1.19 Thu Feb 7 13:33:50 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Mon Feb 11 09:26:07 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/02/07 13:33:50 macallan Exp $ +# $NetBSD: Makefile,v 1.20 2013/02/11 09:26:07 martin Exp $ NOLINT= 1 # defined @@ -43,16 +43,14 @@ SRCS= \ # XXX .if ${MACHINE_ARCH} == i386 -# SSE2 requires a gcc = 4.2 +# SSE2 does not work, for unknown reasons SRCS+= pixman-mmx.c COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden MKDEPFLAGS+= -mmmx -fvisibility=hidden .elif ${MACHINE_ARCH} == x86_64 -SRCS+= pixman-mmx.c -# XXX sse2 is broken with pixman 0.21.2; GCC generates unaligned accesses -#SRCS+= pixman-sse2.c -COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden -#COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden +SRCS+= pixman-sse2.c +COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden +CPPFLAGS+= -DUSE_SSE2 .endif .if ${MACHINE_ARCH} == powerpc
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: macallan Date: Thu Feb 7 13:33:50 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: build altivec support on powerpc To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 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.18 src/external/mit/xorg/lib/pixman/Makefile:1.19 --- src/external/mit/xorg/lib/pixman/Makefile:1.18 Sun Feb 3 12:41:40 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Feb 7 13:33:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/02/03 12:41:40 jmcneill Exp $ +# $NetBSD: Makefile,v 1.19 2013/02/07 13:33:50 macallan Exp $ NOLINT= 1 # defined @@ -55,6 +55,13 @@ COPTS.pixman-mmx.c= -mmmx -fvisibility=h #COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden .endif +.if ${MACHINE_ARCH} == powerpc +SRCS+= pixman-vmx.c +COPTS.pixman-vmx.c= -maltivec +CPPFLAGS+= -DUSE_VMX +MKDEPFLAGS+= -maltivec +.endif + .if ${MACHINE_ARCH} == earm || ${MACHINE_ARCH} == earmhf # ARM SIMD SRCS+= pixman-arm-simd.c \ @@ -71,10 +78,6 @@ COPTS.pixman-mmx.c= -mcpu=iwmmxt CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -# .if VMX -# SRCS+= pixman-vmx.c -# .endif - INCS= pixman.h pixman-version.h INCSDIR=${X11INCDIR}/pixman-1
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: jmcneill Date: Sun Feb 3 12:41:40 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: enable simd, neon, and iwmmxt for earmhf To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 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.17 src/external/mit/xorg/lib/pixman/Makefile:1.18 --- src/external/mit/xorg/lib/pixman/Makefile:1.17 Fri Feb 1 00:17:24 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Feb 3 12:41:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/02/01 00:17:24 jmcneill Exp $ +# $NetBSD: Makefile,v 1.18 2013/02/03 12:41:40 jmcneill Exp $ NOLINT= 1 # defined @@ -55,7 +55,7 @@ COPTS.pixman-mmx.c= -mmmx -fvisibility=h #COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden .endif -.if ${MACHINE_ARCH} == earm +.if ${MACHINE_ARCH} == earm || ${MACHINE_ARCH} == earmhf # ARM SIMD SRCS+= pixman-arm-simd.c \ pixman-arm-simd-asm.S
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: jmcneill Date: Thu Jan 31 10:58:22 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: merge pixman 0.28.2. for arm and earm, enable simd neon support. for earm, enable iwmmx support. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 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.14 src/external/mit/xorg/lib/pixman/Makefile:1.15 --- src/external/mit/xorg/lib/pixman/Makefile:1.14 Wed Aug 3 18:22:29 2011 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Jan 31 10:58:22 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2011/08/03 18:22:29 mrg Exp $ +# $NetBSD: Makefile,v 1.15 2013/01/31 10:58:22 jmcneill Exp $ NOLINT= 1 # defined @@ -9,32 +9,36 @@ LIB= pixman-1 DIST= ${X11SRCDIR.pixman}/pixman .PATH: ${DIST} -SRCS= \ - pixman-access.c\ - pixman-access-accessors.c \ - pixman-cpu.c\ - pixman-gradient-walker.c \ - pixman-region16.c \ - pixman-region32.c \ - pixman-image.c\ - pixman-implementation.c \ - pixman-combine32.c \ - pixman-combine64.c \ - pixman-general.c \ - pixman.c\ - pixman-fast-path.c \ - pixman-solid-fill.c \ - pixman-conical-gradient.c \ - pixman-linear-gradient.c \ - pixman-radial-gradient.c \ - pixman-bits-image.c \ - pixman-utils.c\ - pixman-edge.c\ - pixman-edge-accessors.c \ - pixman-noop.c\ - pixman-trap.c\ - pixman-timer.c\ - pixman-matrix.c +SRCS= \ + pixman.c \ + pixman-access.c \ + pixman-access-accessors.c \ + pixman-bits-image.c \ + pixman-combine32.c \ + pixman-combine-float.c \ + pixman-conical-gradient.c \ + pixman-x86.c \ + pixman-mips.c \ + pixman-arm.c \ + pixman-ppc.c \ + pixman-edge.c \ + pixman-edge-accessors.c \ + pixman-fast-path.c \ + pixman-glyph.c \ + pixman-general.c \ + pixman-gradient-walker.c \ + pixman-image.c \ + pixman-implementation.c \ + pixman-linear-gradient.c \ + pixman-matrix.c \ + pixman-noop.c \ + pixman-radial-gradient.c \ + pixman-region16.c \ + pixman-region32.c \ + pixman-solid-fill.c \ + pixman-timer.c \ + pixman-trap.c \ + pixman-utils.c # XXX @@ -51,6 +55,24 @@ COPTS.pixman-mmx.c= -mmmx -fvisibility=h #COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden .endif +.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm +# ARM SIMD +SRCS+= pixman-arm-simd.c \ + pixman-arm-simd-asm.S +CPPFLAGS+= -DUSE_ARM_SIMD +# ARM NEON +SRCS+= pixman-arm-neon.c \ + pixman-arm-neon-asm.S \ + pixman-arm-neon-asm-bilinear.S +CPPFLAGS+= -DUSE_ARM_NEON +.endif +.if ${MACHINE_ARCH} == earm +# ARM iwMMX +SRCS+= pixman-mmx.c +COPTS.pixman-mmx.c= -mcpu=iwmmxt +CPPFLAGS+= -DUSE_ARM_IWMMXT +.endif + # .if VMX # SRCS+= pixman-vmx.c # .endif
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: jmcneill Date: Thu Jan 31 12:21:12 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Remove PIXMAN_NO_TLS and replace with HAVE_PTHREAD_SETSPECIFIC so the installed library is actually thread-safe. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 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.15 src/external/mit/xorg/lib/pixman/Makefile:1.16 --- src/external/mit/xorg/lib/pixman/Makefile:1.15 Thu Jan 31 10:58:22 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Jan 31 12:21:12 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/01/31 10:58:22 jmcneill Exp $ +# $NetBSD: Makefile,v 1.16 2013/01/31 12:21:12 jmcneill Exp $ NOLINT= 1 # defined @@ -85,8 +85,9 @@ CPPFLAGS+= -DHAVE_CONFIG_H \ -I${X11SRCDIR.pixman}/../combine \ -I${X11SRCDIR.pixman}/pixman -# XXX! wants __thread -CPPFLAGS+= -DPIXMAN_NO_TLS +# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS +CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC +#CPPFLAGS+= -DTLS=__thread LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: jmcneill Date: Fri Feb 1 00:17:25 UTC 2013 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: only enable ARM SIMD and NEON for earm, as the configure script tests for this To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 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.16 src/external/mit/xorg/lib/pixman/Makefile:1.17 --- src/external/mit/xorg/lib/pixman/Makefile:1.16 Thu Jan 31 12:21:12 2013 +++ src/external/mit/xorg/lib/pixman/Makefile Fri Feb 1 00:17:24 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/01/31 12:21:12 jmcneill Exp $ +# $NetBSD: Makefile,v 1.17 2013/02/01 00:17:24 jmcneill Exp $ NOLINT= 1 # defined @@ -55,7 +55,7 @@ COPTS.pixman-mmx.c= -mmmx -fvisibility=h #COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden .endif -.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == earm +.if ${MACHINE_ARCH} == earm # ARM SIMD SRCS+= pixman-arm-simd.c \ pixman-arm-simd-asm.S @@ -65,8 +65,6 @@ SRCS+= pixman-arm-neon.c \ pixman-arm-neon-asm.S \ pixman-arm-neon-asm-bilinear.S CPPFLAGS+= -DUSE_ARM_NEON -.endif -.if ${MACHINE_ARCH} == earm # ARM iwMMX SRCS+= pixman-mmx.c COPTS.pixman-mmx.c= -mcpu=iwmmxt
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Wed Aug 3 18:22:29 UTC 2011 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: include pixman-noop.c. oops. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 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.13 src/external/mit/xorg/lib/pixman/Makefile:1.14 --- src/external/mit/xorg/lib/pixman/Makefile:1.13 Wed Dec 1 08:59:12 2010 +++ src/external/mit/xorg/lib/pixman/Makefile Wed Aug 3 18:22:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/12/01 08:59:12 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2011/08/03 18:22:29 mrg Exp $ NOLINT= 1 # defined @@ -31,6 +31,7 @@ pixman-utils.c\ pixman-edge.c\ pixman-edge-accessors.c \ + pixman-noop.c\ pixman-trap.c\ pixman-timer.c\ pixman-matrix.c
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Wed Dec 1 08:59:13 UTC 2010 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: dsable SSE2 support on amd64 for now. GCC generates code that causes alignment faults. the code is: 0x7f7ffd40ccd7 _pixman_implementation_create_sse2+0: push %rbp 0x7f7ffd40ccd8 _pixman_implementation_create_sse2+1: mov%rsp,%rbp 0x7f7ffd40ccdb _pixman_implementation_create_sse2+4: sub $0x10,%rsp ... 0x7f7ffd40cdab _pixman_implementation_create_sse2+212:mov $0x,%rdx 0x7f7ffd40cdb2 _pixman_implementation_create_sse2+219:mov %rdx,0xfff0(%rbp) 0x7f7ffd40cdb6 _pixman_implementation_create_sse2+223:mov %rdx,0xfff8(%rbp) 0x7f7ffd40cdba _pixman_implementation_create_sse2+227:movdqa 0xfff0(%rbp),%xmm0 upon entry we have stack aligned to 16 bytes. the first instruction subtracts 8, we copy this not-16-byte aligned value into %rbp, and then decrement the stack by 16 bytes. then we store a big -1 into 16 bytes on the stack, and then load it into %xmm0.. except we load it from an unaligned pointer and GP. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 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.12 src/external/mit/xorg/lib/pixman/Makefile:1.13 --- src/external/mit/xorg/lib/pixman/Makefile:1.12 Sun Nov 21 09:01:35 2010 +++ src/external/mit/xorg/lib/pixman/Makefile Wed Dec 1 08:59:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/11/21 09:01:35 mrg Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/01 08:59:12 mrg Exp $ NOLINT= 1 # defined @@ -44,10 +44,10 @@ MKDEPFLAGS+= -mmmx -fvisibility=hidden .elif ${MACHINE_ARCH} == x86_64 SRCS+= pixman-mmx.c -SRCS+= pixman-sse2.c +# XXX sse2 is broken with pixman 0.21.2; GCC generates unaligned accesses +#SRCS+= pixman-sse2.c COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden -COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden -MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden +#COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden .endif # .if VMX
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Sun Nov 21 09:01:35 UTC 2010 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: update for pixman 0.21.2. we really need __thread, it seems. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 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.11 src/external/mit/xorg/lib/pixman/Makefile:1.12 --- src/external/mit/xorg/lib/pixman/Makefile:1.11 Sun May 23 04:26:19 2010 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Nov 21 09:01:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/05/23 04:26:19 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2010/11/21 09:01:35 mrg Exp $ NOLINT= 1 # defined @@ -62,6 +62,9 @@ -I${X11SRCDIR.pixman}/../combine \ -I${X11SRCDIR.pixman}/pixman +# XXX! wants __thread +CPPFLAGS+= -DPIXMAN_NO_TLS + LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm PKGCONFIG= pixman-1
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Mon Nov 9 01:11:59 UTC 2009 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: disable using sse2 for i386. from drochner@ and ve...@. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 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.9 src/external/mit/xorg/lib/pixman/Makefile:1.10 --- src/external/mit/xorg/lib/pixman/Makefile:1.9 Thu Jul 9 02:15:48 2009 +++ src/external/mit/xorg/lib/pixman/Makefile Mon Nov 9 01:11:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/07/09 02:15:48 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2009/11/09 01:11:59 mrg Exp $ NOLINT= 1 # defined @@ -37,12 +37,17 @@ # XXX -.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 +.if ${MACHINE_ARCH} == i386 +# SSE2 requires a gcc = 4.2 +SRCS+= pixman-mmx.c +COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden +MKDEPFLAGS+= -mmmx -fvisibility=hidden +.elif ${MACHINE_ARCH} == x86_64 SRCS+= pixman-mmx.c SRCS+= pixman-sse2.c -MKDEPFLAGS+= -msse -mmmx -fvisibility=hidden -COPTS.pixman-mmx.c= -msse -mmmx -fvisibility=hidden -COPTS.pixman-sse2.c= -msse -mmmx -fvisibility=hidden +COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden +COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden +MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden .endif # .if VMX
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Thu Jun 11 05:11:14 UTC 2009 Modified Files: src/external/mit/xorg/lib/pixman: Makefile shlib_version Log Message: update reach over build for pixman 0.15.10. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/pixman/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/pixman/shlib_version 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.7 src/external/mit/xorg/lib/pixman/Makefile:1.8 --- src/external/mit/xorg/lib/pixman/Makefile:1.7 Thu Nov 6 22:28:26 2008 +++ src/external/mit/xorg/lib/pixman/Makefile Thu Jun 11 05:11:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/11/06 22:28:26 veego Exp $ +# $NetBSD: Makefile,v 1.8 2009/06/11 05:11:14 mrg Exp $ NOLINT= 1 # defined @@ -11,11 +11,15 @@ SRCS= pixman-access.c pixman-region16.c pixman-access-accessors.c \ pixman-region32.c pixman-image.c pixman-combine32.c \ - pixman-combine64.c pixman-compose.c pixman-compose-accessors.c \ - pixman-pict.c pixman-source.c pixman-transformed.c pixman-utils.c \ - pixman-transformed-accessors.c pixman-edge.c \ + pixman-combine64.c \ + pixman-pict.c pixman-utils.c \ + pixman-edge.c \ pixman-edge-accessors.c pixman-trap.c pixman-compute-region.c \ - pixman-timer.c + pixman-general.c pixman-fast-path.c pixman-solid-fill.c \ + pixman-conical-gradient.c pixman-linear-gradient.c \ + pixman-radial-gradient.c pixman-bits-image.c \ + pixman-timer.c pixman-matrix.c pixman-cpu.c \ + pixman-gradient-walker.c pixman-implementation.c # XXX Index: src/external/mit/xorg/lib/pixman/shlib_version diff -u src/external/mit/xorg/lib/pixman/shlib_version:1.3 src/external/mit/xorg/lib/pixman/shlib_version:1.4 --- src/external/mit/xorg/lib/pixman/shlib_version:1.3 Sun Jan 11 03:10:13 2009 +++ src/external/mit/xorg/lib/pixman/shlib_version Thu Jun 11 05:11:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.3 2009/01/11 03:10:13 christos Exp $ +# $NetBSD: shlib_version,v 1.4 2009/06/11 05:11:14 mrg Exp $ # -major=1 +major=2 minor=0