Module Name: src
Committed By: kamil
Date: Fri Jun 29 11:33:47 UTC 2018
Modified Files:
src/external/cddl/osnet/dev/dtrace: dtrace_hacks.c
src/external/cddl/osnet/dev/dtrace/x86: dis_tables.c
src/external/cddl/osnet/dev/profile: profile.c
src/external/cddl/osnet/dev/systrace: systrace.c
src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
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:
Rework the changes to DTRACE/ZFS files that were fixing Clang/LLVM build
Rever changes to upstream files and replace them with additional -Wno-
compiler argument flags.
Tested with base LLVM.
Requested by <chuq>
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/dev/profile/profile.c
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/dev/systrace/systrace.c
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
cvs rdiff -u -r1.37 -r1.38 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/linux32_syscall/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/dtrace/linux_syscall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/dtrace/profile/Makefile
cvs rdiff -u -r1.5 -r1.6 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/dev/dtrace/dtrace_hacks.c
diff -u src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.7 src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.8
--- src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.7 Wed Jun 6 15:54:03 2018
+++ src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c Fri Jun 29 11:33:46 2018
@@ -1,15 +1,13 @@
-/* $NetBSD: dtrace_hacks.c,v 1.7 2018/06/06 15:54:03 kamil Exp $ */
+/* $NetBSD: dtrace_hacks.c,v 1.8 2018/06/29 11:33:46 kamil Exp $ */
/* $FreeBSD: head/sys/cddl/dev/dtrace/dtrace_hacks.c 281916 2015-04-24 03:19:30Z markj $ */
/* XXX Hacks.... */
-#include <sys/cdefs.h>
-
dtrace_cacheid_t dtrace_predcache_id;
boolean_t
priv_policy_only(const cred_t *cr, int b, boolean_t c)
{
- return kauth_authorize_generic(__UNCONST(cr), KAUTH_GENERIC_ISSUSER, NULL) == 0;
+ return kauth_authorize_generic(cr, KAUTH_GENERIC_ISSUSER, NULL) == 0;
}
Index: src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c
diff -u src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c:1.2 src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c:1.3
--- src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c:1.2 Wed Jun 6 17:16:56 2018
+++ src/external/cddl/osnet/dev/dtrace/x86/dis_tables.c Fri Jun 29 11:33:46 2018
@@ -2345,7 +2345,7 @@ typedef struct dis_gather_regs {
uint_t dgr_arg0; /* src reg */
uint_t dgr_arg1; /* vsib reg */
uint_t dgr_arg2; /* dst reg */
- const char *dgr_suffix; /* suffix to append */
+ char *dgr_suffix; /* suffix to append */
} dis_gather_regs_t;
static dis_gather_regs_t dis_vgather[4][2][2] = {
Index: src/external/cddl/osnet/dev/profile/profile.c
diff -u src/external/cddl/osnet/dev/profile/profile.c:1.9 src/external/cddl/osnet/dev/profile/profile.c:1.10
--- src/external/cddl/osnet/dev/profile/profile.c:1.9 Wed Jun 6 17:19:49 2018
+++ src/external/cddl/osnet/dev/profile/profile.c Fri Jun 29 11:33:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.c,v 1.9 2018/06/06 17:19:49 kamil Exp $ */
+/* $NetBSD: profile.c,v 1.10 2018/06/29 11:33:46 kamil Exp $ */
/*
* CDDL HEADER START
@@ -434,7 +434,7 @@ profile_provide(void *arg, dtrace_probed
char *name, *suffix = NULL;
const struct {
- const char *prefix;
+ char *prefix;
int kind;
} types[] = {
{ PROF_PREFIX_PROFILE, PROF_PROFILE },
@@ -443,7 +443,7 @@ profile_provide(void *arg, dtrace_probed
};
const struct {
- const char *name;
+ char *name;
hrtime_t mult;
} suffixes[] = {
{ "ns", NANOSEC / NANOSEC },
Index: src/external/cddl/osnet/dev/systrace/systrace.c
diff -u src/external/cddl/osnet/dev/systrace/systrace.c:1.11 src/external/cddl/osnet/dev/systrace/systrace.c:1.12
--- src/external/cddl/osnet/dev/systrace/systrace.c:1.11 Wed Jun 6 17:47:10 2018
+++ src/external/cddl/osnet/dev/systrace/systrace.c Fri Jun 29 11:33:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace.c,v 1.11 2018/06/06 17:47:10 kamil Exp $ */
+/* $NetBSD: systrace.c,v 1.12 2018/06/29 11:33:46 kamil Exp $ */
/*
* CDDL HEADER START
@@ -356,7 +356,7 @@ systrace_provide(void *arg, dtrace_probe
#else
const char *name = ALTSYSCALLNAMES[i] ? ALTSYSCALLNAMES[i] :
SYSCALLNAMES[i];
- if (dtrace_probe_lookup(systrace_id, NULL, __UNCONST(name), __UNCONST("entry")) != 0)
+ if (dtrace_probe_lookup(systrace_id, NULL, name, "entry") != 0)
continue;
(void) dtrace_probe_create(systrace_id, NULL,
Index: src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.12 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.13
--- src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.12 Wed Jun 6 14:46:58 2018
+++ src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c Fri Jun 29 11:33:47 2018
@@ -555,7 +555,7 @@ static void
print_probe_info(const dtrace_probeinfo_t *p)
{
char buf[BUFSIZ];
- const char *user;
+ char *user;
int i;
oprintf("\n\tProbe Description Attributes\n");
@@ -1164,8 +1164,8 @@ go(void)
int i;
struct {
- const char *name;
- const char *optname;
+ char *name;
+ char *optname;
dtrace_optval_t val;
} bufs[] = {
{ "buffer size", "bufsize" },
@@ -1221,7 +1221,7 @@ go(void)
for (i = 0; rates[i].name != NULL; i++) {
dtrace_optval_t nval;
- const char *dir;
+ char *dir;
if (rates[i].val == DTRACEOPT_UNSET)
continue;
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.37 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.38
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.37 Wed Jun 6 15:24:57 2018
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Fri Jun 29 11:33:47 2018
@@ -1263,7 +1263,7 @@ dtrace_strtoll(char *input, int base, si
* Compare two strings using safe loads.
*/
static int
-dtrace_strncmp(const char *s1, const char *s2, size_t limit)
+dtrace_strncmp(char *s1, char *s2, size_t limit)
{
uint8_t c1, c2;
volatile uint16_t *flags;
@@ -6592,7 +6592,7 @@ dtrace_dif_emulate(dtrace_difo_t *difo,
size_t sz = state->dts_options[DTRACEOPT_STRSIZE];
uintptr_t s1 = regs[r1];
uintptr_t s2 = regs[r2];
- size_t lim1 = 0, lim2 = 0;
+ size_t lim1, lim2;
if (s1 != 0 &&
!dtrace_strcanload(s1, sz, &lim1, mstate, vstate))
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.12 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.13
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.12 Thu Jun 7 13:21:44 2018
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Fri Jun 29 11:33:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/06/07 13:21:44 kamil Exp $
+# $NetBSD: Makefile,v 1.13 2018/06/29 11:33:47 kamil Exp $
# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -34,6 +34,7 @@ COPTS.dtrace.c += -Wno-format-extra-args
COPTS.dtrace.c += -Wno-shadow
COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
+COPTS.dtrace.c += ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
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.9 src/sys/modules/dtrace/dtrace/Makefile:1.10
--- src/sys/modules/dtrace/dtrace/Makefile:1.9 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/dtrace/Makefile Fri Jun 29 11:33:47 2018
@@ -44,7 +44,10 @@ CPPFLAGS+= -Wno-unknown-pragmas \
-Wno-unused-variable \
-Wno-unused-function
-CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? \
+ -Wno-sometimes-uninitialized \
+ -Wno-incompatible-pointer-types-discards-qualifiers :}
COPTS.dis_tables.c+= \
-Wno-missing-field-initializers \
Index: src/sys/modules/dtrace/linux32_syscall/Makefile
diff -u src/sys/modules/dtrace/linux32_syscall/Makefile:1.5 src/sys/modules/dtrace/linux32_syscall/Makefile:1.6
--- src/sys/modules/dtrace/linux32_syscall/Makefile:1.5 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/linux32_syscall/Makefile Fri Jun 29 11:33:47 2018
@@ -14,5 +14,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/linux_syscall/Makefile
diff -u src/sys/modules/dtrace/linux_syscall/Makefile:1.6 src/sys/modules/dtrace/linux_syscall/Makefile:1.7
--- src/sys/modules/dtrace/linux_syscall/Makefile:1.6 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/linux_syscall/Makefile Fri Jun 29 11:33:47 2018
@@ -14,5 +14,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/netbsd32_syscall/Makefile
diff -u src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.5 src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.6
--- src/sys/modules/dtrace/netbsd32_syscall/Makefile:1.5 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/netbsd32_syscall/Makefile Fri Jun 29 11:33:47 2018
@@ -14,5 +14,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/profile/Makefile
diff -u src/sys/modules/dtrace/profile/Makefile:1.6 src/sys/modules/dtrace/profile/Makefile:1.7
--- src/sys/modules/dtrace/profile/Makefile:1.6 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/profile/Makefile Fri Jun 29 11:33:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/06/07 13:21:44 kamil Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/29 11:33:47 kamil Exp $
.include "../../Makefile.inc"
@@ -14,5 +14,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual
CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
.include <bsd.kmodule.mk>
Index: src/sys/modules/dtrace/syscall/Makefile
diff -u src/sys/modules/dtrace/syscall/Makefile:1.5 src/sys/modules/dtrace/syscall/Makefile:1.6
--- src/sys/modules/dtrace/syscall/Makefile:1.5 Thu Jun 7 13:21:44 2018
+++ src/sys/modules/dtrace/syscall/Makefile Fri Jun 29 11:33:47 2018
@@ -14,5 +14,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/external/cd
CPPFLAGS+= -Wno-unknown-pragmas
CPPFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+CPPFLAGS+= ${${ACTIVE_CC} == "clang" :? -Wno-incompatible-pointer-types-discards-qualifiers :}
.include <bsd.kmodule.mk>
