Module Name: src
Committed By: tron
Date: Wed Mar 5 20:14:15 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
Log Message:
Fix build of DTrace with GCC 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.24 -r1.25 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
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/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.12 src/external/cddl/osnet/dev/fbt/fbt.c:1.13
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.12 Sun Mar 3 18:18:13 2013
+++ src/external/cddl/osnet/dev/fbt/fbt.c Wed Mar 5 20:14:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.12 2013/03/03 18:18:13 christos Exp $ */
+/* $NetBSD: fbt.c,v 1.13 2014/03/05 20:14:15 tron Exp $ */
/*
* CDDL HEADER START
@@ -703,7 +703,6 @@ static int
fbt_ctfoff_init(dtrace_modctl_t *mod, mod_ctf_t *mc)
{
const Elf_Sym *symp = mc->symtab;
- const char *name;
const ctf_header_t *hp = (const ctf_header_t *) mc->ctftab;
const uint8_t *ctfdata = mc->ctftab + sizeof(ctf_header_t);
int i;
@@ -758,11 +757,6 @@ fbt_ctfoff_init(dtrace_modctl_t *mod, mo
continue;
}
- if (symp->st_name < mc->strcnt)
- name = mc->strtab + symp->st_name;
- else
- name = "(?)";
-
switch (ELF_ST_TYPE(symp->st_info)) {
case STT_OBJECT:
if (objtoff >= hp->cth_funcoff ||
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.24 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.25
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.24 Wed Mar 5 06:12:00 2014
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Wed Mar 5 20:14:15 2014
@@ -16666,6 +16666,7 @@ dtrace_state_worker_add(void (*fn)(dtrac
w->exiting = false;
error = kthread_create(PRI_NONE, KTHREAD_MPSAFE|KTHREAD_MUSTJOIN, NULL,
dtrace_state_worker_thread, w, &w->lwp, "dtrace-state-worker");
+ (void) error;
KASSERT(error == 0); /* XXX */
return w;
}
