Module Name: src
Committed By: kamil
Date: Wed Jun 6 14:57:38 UTC 2018
Modified Files:
src/sys/modules/dtrace/dtrace: Makefile
src/sys/modules/dtrace/linux32_syscall: Makefile
src/sys/modules/dtrace/linux_syscall: Makefile
src/sys/modules/dtrace/netbsd32_syscall: Makefile
src/sys/modules/dtrace/profile: Makefile
src/sys/modules/dtrace/syscall: Makefile
Log Message:
Restrict -Wno-discarded-qualifiers in sys/modules/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>
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/linux32_syscall/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/linux_syscall/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/profile/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/dtrace/syscall/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.5 src/sys/modules/dtrace/dtrace/Makefile:1.6
--- src/sys/modules/dtrace/dtrace/Makefile:1.5 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/dtrace/Makefile Wed Jun 6 14:57:38 2018
@@ -42,9 +42,12 @@ CPPFLAGS+= -I${OSNETDIR}/sys \
CPPFLAGS+= -Wno-unknown-pragmas \
-Wno-shadow \
-Wno-unused-variable \
- -Wno-discarded-qualifiers \
-Wno-unused-function
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
+
COPTS.dis_tables.c+= \
-Wno-missing-field-initializers \
-Wno-cast-qual \
Index: src/sys/modules/dtrace/linux32_syscall/Makefile
diff -u src/sys/modules/dtrace/linux32_syscall/Makefile:1.2 src/sys/modules/dtrace/linux32_syscall/Makefile:1.3
--- src/sys/modules/dtrace/linux32_syscall/Makefile:1.2 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/linux32_syscall/Makefile Wed Jun 6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas \
- -Wno-discarded-qualifiers
+CPPFLAGS+= -Wno-unknown-pragmas
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u src/sys/modules/dtrace/linux_syscall/Makefile:1.2 src/sys/modules/dtrace/linux_syscall/Makefile:1.3
--- src/sys/modules/dtrace/linux_syscall/Makefile:1.2 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/linux_syscall/Makefile Wed Jun 6 14:57:38 2018
@@ -14,4 +14,8 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas \
-Wno-discarded-qualifiers
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.2 src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.3
--- src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.2 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile Wed Jun 6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas \
- -Wno-discarded-qualifiers
+CPPFLAGS+= -Wno-unknown-pragmas
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/profile/Makefile
diff -u src/sys/modules/dtrace/profile/Makefile:1.3 src/sys/modules/dtrace/profile/Makefile:1.4
--- src/sys/modules/dtrace/profile/Makefile:1.3 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/profile/Makefile Wed Jun 6 14:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/28 21:05:01 chs Exp $
+# $NetBSD: Makefile,v 1.4 2018/06/06 14:57:38 kamil Exp $
.include "../../Makefile.inc"
@@ -11,6 +11,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/profile \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
-CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual -Wno-discarded-qualifiers
+CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/syscall/Makefile
diff -u src/sys/modules/dtrace/syscall/Makefile:1.2 src/sys/modules/dtrace/syscall/Makefile:1.3
--- src/sys/modules/dtrace/syscall/Makefile:1.2 Mon May 28 21:05:01 2018
+++ src/sys/modules/dtrace/syscall/Makefile Wed Jun 6 14:57:38 2018
@@ -11,7 +11,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
-CPPFLAGS+= -Wno-unknown-pragmas \
- -Wno-discarded-qualifiers
+CPPFLAGS+= -Wno-unknown-pragmas
+
+.if defined(HAVE_LLVM)
+CPPFLAGS+= -Wno-discarded-qualifiers
+.endif
.include <bsd.kmodule.mk>
