Wed Jun 6 15:15:41 2018 UTC ()
Restrict -Wno-unused-but-set-variable in sys/modules/dtrace/dtrace to GCC

Clang/LLVM does not recognize it.

This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build.

Sponsored by <The NetBSD Foundation>


(kamil)
diff -r1.7 -r1.8 src/sys/modules/dtrace/dtrace/Makefile
cvs diff -r1.7 -r1.8 src/sys/modules/dtrace/dtrace/Makefile (switch to unified diff)

--- src/sys/modules/dtrace/dtrace/Makefile 2018/06/06 15:01:13 1.7
+++ src/sys/modules/dtrace/dtrace/Makefile 2018/06/06 15:15:41 1.8
@@ -1,67 +1,69 @@ @@ -1,67 +1,69 @@
1# $FreeBSD: src/sys/modules/dtrace/dtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $ 1# $FreeBSD: src/sys/modules/dtrace/dtrace/Makefile,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
2 2
3.include "../../Makefile.inc" 3.include "../../Makefile.inc"
4.include "../../Makefile.assym" 4.include "../../Makefile.assym"
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8OSNETDIR=${NETBSDSRCDIR}/external/cddl/osnet 8OSNETDIR=${NETBSDSRCDIR}/external/cddl/osnet
9 9
10.if exists(${OSNETDIR}/dev/dtrace/${MACHINE}) 10.if exists(${OSNETDIR}/dev/dtrace/${MACHINE})
11ARCH=${MACHINE} 11ARCH=${MACHINE}
12.elif exists(${OSNETDIR}/dev/dtrace/${MACHINE_CPU}) 12.elif exists(${OSNETDIR}/dev/dtrace/${MACHINE_CPU})
13ARCH=${MACHINE_CPU} 13ARCH=${MACHINE_CPU}
14.else 14.else
15.error ${MACHINE} or ${MACHINE_CPU} not supported. 15.error ${MACHINE} or ${MACHINE_CPU} not supported.
16.endif 16.endif
17 17
18.PATH: ${OSNETDIR}/dist/uts/common/dtrace 18.PATH: ${OSNETDIR}/dist/uts/common/dtrace
19.PATH: ${OSNETDIR}/dev/dtrace 19.PATH: ${OSNETDIR}/dev/dtrace
20.PATH: ${OSNETDIR}/dev/dtrace/${ARCH} 20.PATH: ${OSNETDIR}/dev/dtrace/${ARCH}
21 21
22KMOD= dtrace 22KMOD= dtrace
23SRCS= dtrace.c \ 23SRCS= dtrace.c \
24 dtrace_xoroshiro128_plus.c \ 24 dtrace_xoroshiro128_plus.c \
25 dtrace_asm.S \ 25 dtrace_asm.S \
26 dtrace_subr.c 26 dtrace_subr.c
27 27
28.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" 28.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
29.PATH: ${OSNETDIR}/dev/dtrace/x86 29.PATH: ${OSNETDIR}/dev/dtrace/x86
30SRCS+= dis_tables.c \ 30SRCS+= dis_tables.c \
31 instr_size.c 31 instr_size.c
32CPPFLAGS+= -I${OSNETDIR}/dev/dtrace/x86 32CPPFLAGS+= -I${OSNETDIR}/dev/dtrace/x86
33.endif 33.endif
34 34
35CPPFLAGS+= -I${OSNETDIR}/sys \ 35CPPFLAGS+= -I${OSNETDIR}/sys \
36 -I${OSNETDIR}/dev/dtrace \ 36 -I${OSNETDIR}/dev/dtrace \
37 -I${OSNETDIR}/dev/dtrace/${ARCH} \ 37 -I${OSNETDIR}/dev/dtrace/${ARCH} \
38 -I${OSNETDIR}/dist/uts/common \ 38 -I${OSNETDIR}/dist/uts/common \
39 -I${OSNETDIR}/dist/common/util \ 39 -I${OSNETDIR}/dist/common/util \
40 -DDIS_MEM 40 -DDIS_MEM
41 41
42CPPFLAGS+= -Wno-unknown-pragmas \ 42CPPFLAGS+= -Wno-unknown-pragmas \
43 -Wno-shadow \ 43 -Wno-shadow \
44 -Wno-unused-variable \ 44 -Wno-unused-variable \
45 -Wno-unused-function 45 -Wno-unused-function
46 46
47.if defined(HAVE_GCC) 47.if defined(HAVE_GCC)
48CPPFLAGS+= -Wno-discarded-qualifiers 48CPPFLAGS+= -Wno-discarded-qualifiers
49.endif 49.endif
50 50
51COPTS.dis_tables.c+= \ 51COPTS.dis_tables.c+= \
52 -Wno-missing-field-initializers \ 52 -Wno-missing-field-initializers \
53 -Wno-cast-qual \ 53 -Wno-cast-qual \
54 -Wno-parentheses \ 54 -Wno-parentheses \
55 -Wno-uninitialized 55 -Wno-uninitialized
56 56
 57.if defined(HAVE_GCC)
57COPTS.dtrace.c+= \ 58COPTS.dtrace.c+= \
58 -Wno-unused-but-set-variable \ 59 -Wno-unused-but-set-variable
 60.endif
59 61
60COPTS.dtrace_subr.c+= \ 62COPTS.dtrace_subr.c+= \
61 -Wno-unused-value 63 -Wno-unused-value
62 64
63EXPORT_SYMS= dtrace_register \ 65EXPORT_SYMS= dtrace_register \
64 dtrace_unregister \ 66 dtrace_unregister \
65 dtrace_probe_lookup 67 dtrace_probe_lookup
66 68
67.include <bsd.kmodule.mk> 69.include <bsd.kmodule.mk>