Module Name: src
Committed By: kamil
Date: Thu Jun 7 13:21:44 UTC 2018
Modified Files:
src/external/cddl/osnet: Makefile.zfs
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
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:
Replace HAVE_GCC with ACTIVE_CC == gcc checks
Kernel modules build with GCC and Clang/LLVM.
Requested by <joerg>
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/Makefile.zfs
cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/linux32_syscall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/linux_syscall/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/profile/Makefile
cvs rdiff -u -r1.4 -r1.5 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/external/cddl/osnet/Makefile.zfs
diff -u src/external/cddl/osnet/Makefile.zfs:1.7 src/external/cddl/osnet/Makefile.zfs:1.8
--- src/external/cddl/osnet/Makefile.zfs:1.7 Wed Jun 6 15:01:13 2018
+++ src/external/cddl/osnet/Makefile.zfs Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfs,v 1.7 2018/06/06 15:01:13 kamil Exp $
+# $NetBSD: Makefile.zfs,v 1.8 2018/06/07 13:21:44 kamil Exp $
.include <bsd.own.mk>
@@ -42,9 +42,7 @@ CPPFLAGS+= -I${ZFSDIR}/dist/common
CWARNFLAGS+= -Wno-missing-field-initializers
CWARNFLAGS+= -Wno-strict-prototypes
CWARNFLAGS+= -Wno-cast-qual
-.if defined(HAVE_GCC)
-CWARNFLAGS+= -Wno-discarded-qualifiers
-.endif
+CWARNFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
CWARNFLAGS+= -Wno-switch
CWARNFLAGS+= -Wno-missing-prototypes
CWARNFLAGS+= -Wno-unused-variable
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.18 src/external/cddl/osnet/lib/libdtrace/Makefile:1.19
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.18 Wed Jun 6 14:18:39 2018
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/06/06 14:18:39 kamil Exp $
+# $NetBSD: Makefile,v 1.19 2018/06/07 13:21:44 kamil Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -87,13 +87,9 @@ COPTS.dt_provider.c += -Wno-stack-protec
COPTS.dt_subr.c += -Wno-stack-protector
COPTS.dt_consume.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dt_consume.c += -Wno-maybe-uninitialized
-.endif
+COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
COPTS.dt_options.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dt_pid.c += -Wno-unused-but-set-variable
-.endif
+COPTS.dt_pid.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dt_isadep.c += -Wno-unused-variable
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -102,9 +98,7 @@ CPPFLAGS+= -I${.CURDIR}/../../dev/dtrace
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/i386 ${.CURDIR}/../../dev/dtrace/x86
SRCS+= dis_tables.c
COPTS.dis_tables.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dis_tables.c += -Wno-maybe-uninitialized
-.endif
+COPTS.dis_tables.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
.elif ${MACHINE_ARCH} == "sparc64"
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
.elif ${MACHINE_CPU} == "arm"
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.11 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.12
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.11 Wed Jun 6 14:31:45 2018
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/06/06 14:31:45 kamil Exp $
+# $NetBSD: Makefile,v 1.12 2018/06/07 13:21:44 kamil Exp $
# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -32,10 +32,8 @@ COPTS.dtrace.c += -Wno-stack-protector
COPTS.dtrace.c += -Wno-format-extra-args
COPTS.dtrace.c += -Wno-shadow
-.if defined(HAVE_GCC)
-COPTS.dtrace.c += -Wno-discarded-qualifiers
-COPTS.dtrace.c += -Wno-unused-but-set-variable
-.endif
+COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dtrace.c += -Wno-missing-field-initializers
COPTS.dtrace.c += -Wno-format
Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.8 src/sys/modules/dtrace/dtrace/Makefile:1.9
--- src/sys/modules/dtrace/dtrace/Makefile:1.8 Wed Jun 6 15:15:41 2018
+++ src/sys/modules/dtrace/dtrace/Makefile Thu Jun 7 13:21:44 2018
@@ -44,9 +44,7 @@ CPPFLAGS+= -Wno-unknown-pragmas \
-Wno-unused-variable \
-Wno-unused-function
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
COPTS.dis_tables.c+= \
-Wno-missing-field-initializers \
@@ -54,10 +52,7 @@ COPTS.dis_tables.c+= \
-Wno-parentheses \
-Wno-uninitialized
-.if defined(HAVE_GCC)
-COPTS.dtrace.c+= \
- -Wno-unused-but-set-variable
-.endif
+COPTS.dtrace.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dtrace_subr.c+= \
-Wno-unused-value
Index: src/sys/modules/dtrace/linux32_syscall/Makefile
diff -u src/sys/modules/dtrace/linux32_syscall/Makefile:1.4 src/sys/modules/dtrace/linux32_syscall/Makefile:1.5
--- src/sys/modules/dtrace/linux32_syscall/Makefile:1.4 Wed Jun 6 15:01:13 2018
+++ src/sys/modules/dtrace/linux32_syscall/Makefile Thu Jun 7 13:21:44 2018
@@ -13,8 +13,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u src/sys/modules/dtrace/linux_syscall/Makefile:1.5 src/sys/modules/dtrace/linux_syscall/Makefile:1.6
--- src/sys/modules/dtrace/linux_syscall/Makefile:1.5 Wed Jun 6 17:54:33 2018
+++ src/sys/modules/dtrace/linux_syscall/Makefile Thu Jun 7 13:21:44 2018
@@ -13,8 +13,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.4 src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.5
--- src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.4 Wed Jun 6 15:01:13 2018
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile Thu Jun 7 13:21:44 2018
@@ -13,8 +13,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/profile/Makefile
diff -u src/sys/modules/dtrace/profile/Makefile:1.5 src/sys/modules/dtrace/profile/Makefile:1.6
--- src/sys/modules/dtrace/profile/Makefile:1.5 Wed Jun 6 15:01:13 2018
+++ src/sys/modules/dtrace/profile/Makefile Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/06/06 15:01:13 kamil Exp $
+# $NetBSD: Makefile,v 1.6 2018/06/07 13:21:44 kamil Exp $
.include "../../Makefile.inc"
@@ -13,8 +13,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/syscall/Makefile
diff -u src/sys/modules/dtrace/syscall/Makefile:1.4 src/sys/modules/dtrace/syscall/Makefile:1.5
--- src/sys/modules/dtrace/syscall/Makefile:1.4 Wed Jun 6 15:01:13 2018
+++ src/sys/modules/dtrace/syscall/Makefile Thu Jun 7 13:21:44 2018
@@ -13,8 +13,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
-.if defined(HAVE_GCC)
-CPPFLAGS+= -Wno-discarded-qualifiers
-.endif
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
.include <bsd.kmodule.mk>
