Sat Nov 7 20:45:03 2015 UTC ()
change MKDEPFLAGS from
  -msse2 -mssse3 -mssse3 -fvisibility=hidden
to
  -msse2 -msse3 -mssse3 -fvisibility=hidden

OK dholland@ at tech-x11@


(szptvlfn)
diff -r1.33 -r1.34 src/external/mit/xorg/lib/pixman/Makefile
cvs diff -r1.33 -r1.34 src/external/mit/xorg/lib/pixman/Makefile (switch to unified diff)

--- src/external/mit/xorg/lib/pixman/Makefile 2015/11/06 21:32:22 1.33
+++ src/external/mit/xorg/lib/pixman/Makefile 2015/11/07 20:45:03 1.34
@@ -1,119 +1,119 @@ @@ -1,119 +1,119 @@
1# $NetBSD: Makefile,v 1.33 2015/11/06 21:32:22 szptvlfn Exp $ 1# $NetBSD: Makefile,v 1.34 2015/11/07 20:45:03 szptvlfn Exp $
2 2
3NOLINT= 1 # defined 3NOLINT= 1 # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7LIB= pixman-1 7LIB= pixman-1
8 8
9DIST= ${X11SRCDIR.pixman}/pixman 9DIST= ${X11SRCDIR.pixman}/pixman
10.PATH: ${DIST} 10.PATH: ${DIST}
11 11
12SRCS= \ 12SRCS= \
13 pixman.c \ 13 pixman.c \
14 pixman-access.c \ 14 pixman-access.c \
15 pixman-access-accessors.c \ 15 pixman-access-accessors.c \
16 pixman-bits-image.c \ 16 pixman-bits-image.c \
17 pixman-combine32.c \ 17 pixman-combine32.c \
18 pixman-combine-float.c \ 18 pixman-combine-float.c \
19 pixman-conical-gradient.c \ 19 pixman-conical-gradient.c \
20 pixman-edge.c \ 20 pixman-edge.c \
21 pixman-edge-accessors.c \ 21 pixman-edge-accessors.c \
22 pixman-fast-path.c \ 22 pixman-fast-path.c \
23 pixman-filter.c \ 23 pixman-filter.c \
24 pixman-glyph.c \ 24 pixman-glyph.c \
25 pixman-general.c \ 25 pixman-general.c \
26 pixman-gradient-walker.c \ 26 pixman-gradient-walker.c \
27 pixman-image.c \ 27 pixman-image.c \
28 pixman-implementation.c \ 28 pixman-implementation.c \
29 pixman-linear-gradient.c \ 29 pixman-linear-gradient.c \
30 pixman-matrix.c \ 30 pixman-matrix.c \
31 pixman-noop.c \ 31 pixman-noop.c \
32 pixman-radial-gradient.c \ 32 pixman-radial-gradient.c \
33 pixman-region16.c \ 33 pixman-region16.c \
34 pixman-region32.c \ 34 pixman-region32.c \
35 pixman-solid-fill.c \ 35 pixman-solid-fill.c \
36 pixman-timer.c \ 36 pixman-timer.c \
37 pixman-trap.c \ 37 pixman-trap.c \
38 pixman-utils.c 38 pixman-utils.c
39 39
40SRCS+= \ 40SRCS+= \
41 pixman-x86.c \ 41 pixman-x86.c \
42 pixman-mips.c \ 42 pixman-mips.c \
43 pixman-arm.c \ 43 pixman-arm.c \
44 pixman-ppc.c 44 pixman-ppc.c
45 45
46# XXX 46# XXX
47 47
48# missing: HAVE_GCC_VECTOR_EXTENSIONS 48# missing: HAVE_GCC_VECTOR_EXTENSIONS
49 49
50.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 50.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
51. if ${MACHINE_ARCH} == "i386" 51. if ${MACHINE_ARCH} == "i386"
52SRCS+= pixman-mmx.c 52SRCS+= pixman-mmx.c
53COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden 53COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
54. if defined(HAVE_LLVM) 54. if defined(HAVE_LLVM)
55COPTS.pixman-mmx.c+= -Wno-error=attributes 55COPTS.pixman-mmx.c+= -Wno-error=attributes
56. endif 56. endif
57CPPFLAGS+= -DUSE_X86_MMX 57CPPFLAGS+= -DUSE_X86_MMX
58MKDEPFLAGS+= -mmmx 58MKDEPFLAGS+= -mmmx
59. endif 59. endif
60SRCS+= pixman-sse2.c pixman-ssse3.c 60SRCS+= pixman-sse2.c pixman-ssse3.c
61COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden 61COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
62COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden 62COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
63CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3 63CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
64MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden 64MKDEPFLAGS+= -msse2 -msse3 -mssse3 -fvisibility=hidden
65.endif 65.endif
66 66
67.if ${MACHINE_ARCH} == "powerpc" 67.if ${MACHINE_ARCH} == "powerpc"
68SRCS+= pixman-vmx.c 68SRCS+= pixman-vmx.c
69COPTS.pixman-vmx.c= -maltivec 69COPTS.pixman-vmx.c= -maltivec
70CPPFLAGS+= -DUSE_VMX 70CPPFLAGS+= -DUSE_VMX
71MKDEPFLAGS+= -maltivec 71MKDEPFLAGS+= -maltivec
72.endif 72.endif
73 73
74.if !empty(MACHINE_ARCH:Mearm*) 74.if !empty(MACHINE_ARCH:Mearm*)
75# ARM SIMD 75# ARM SIMD
76SRCS+= pixman-arm-simd.c \ 76SRCS+= pixman-arm-simd.c \
77 pixman-arm-simd-asm.S \ 77 pixman-arm-simd-asm.S \
78 pixman-arm-simd-asm-scaled.S 78 pixman-arm-simd-asm-scaled.S
79CPPFLAGS+= -DUSE_ARM_SIMD 79CPPFLAGS+= -DUSE_ARM_SIMD
80# ARM NEON 80# ARM NEON
81SRCS+= pixman-arm-neon.c \ 81SRCS+= pixman-arm-neon.c \
82 pixman-arm-neon-asm.S \ 82 pixman-arm-neon-asm.S \
83 pixman-arm-neon-asm-bilinear.S 83 pixman-arm-neon-asm-bilinear.S
84CPPFLAGS+= -DUSE_ARM_NEON 84CPPFLAGS+= -DUSE_ARM_NEON
85 85
86AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :} 86AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
87# ARM iwMMX 87# ARM iwMMX
88#SRCS+= pixman-mmx.c 88#SRCS+= pixman-mmx.c
89#COPTS.pixman-mmx.c= -mcpu=iwmmxt 89#COPTS.pixman-mmx.c= -mcpu=iwmmxt
90#CPPFLAGS+= -DUSE_ARM_IWMMXT 90#CPPFLAGS+= -DUSE_ARM_IWMMXT
91.endif 91.endif
92 92
93.if ${MACHINE_ARCH} == "mips64el" 93.if ${MACHINE_ARCH} == "mips64el"
94# Loongson MMI 94# Loongson MMI
95SRCS+= pixman-mmx.c 95SRCS+= pixman-mmx.c
96CPPFLAGS+= -DUSE_LOONGSON_MMI 96CPPFLAGS+= -DUSE_LOONGSON_MMI
97# SIMD instructions use floatpoint registers so we need to enable their use 97# SIMD instructions use floatpoint registers so we need to enable their use
98COPTS.pixman-mmx.c= -march=loongson2f -mhard-float 98COPTS.pixman-mmx.c= -march=loongson2f -mhard-float
99.endif 99.endif
100 100
101INCS= pixman.h pixman-version.h 101INCS= pixman.h pixman-version.h
102INCSDIR=${X11INCDIR}/pixman-1 102INCSDIR=${X11INCDIR}/pixman-1
103 103
104CPPFLAGS+= -DHAVE_CONFIG_H \ 104CPPFLAGS+= -DHAVE_CONFIG_H \
105 -I${X11SRCDIR.pixman}/../include \ 105 -I${X11SRCDIR.pixman}/../include \
106 -I${X11SRCDIR.pixman}/../combine \ 106 -I${X11SRCDIR.pixman}/../combine \
107 -I${X11SRCDIR.pixman}/pixman 107 -I${X11SRCDIR.pixman}/pixman
108 108
109# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS 109# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS
110CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC 110CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC
111#CPPFLAGS+= -DTLS=__thread 111#CPPFLAGS+= -DTLS=__thread
112 112
113LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm 113LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
114 114
115PKGCONFIG= pixman-1 115PKGCONFIG= pixman-1
116PKGDIST= pixman 116PKGDIST= pixman
117 117
118.include <bsd.x11.mk> 118.include <bsd.x11.mk>
119.include <bsd.lib.mk> 119.include <bsd.lib.mk>