Index: external/cddl/osnet/dist/tools/ctf/cvt/ctf.c
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c,v
retrieving revision 1.13
diff -p -u -r1.13 ctf.c
--- external/cddl/osnet/dist/tools/ctf/cvt/ctf.c	18 Mar 2016 17:11:04 -0000	1.13
+++ external/cddl/osnet/dist/tools/ctf/cvt/ctf.c	9 Apr 2016 18:47:41 -0000
@@ -325,6 +325,8 @@ write_type(void *arg1, void *arg2)
 			b->nptent++;
 		}
 	}
+	if (b->nptent > CTF_TYPE_TO_INDEX(CTF_MAX_TYPE))
+		terminate("too many types\n");
 
 	offset = strtab_insert(&b->ctb_strtab, tp->t_name);
 	ctt.ctt_name = CTF_TYPE_NAME(CTF_STRTAB_0, offset);
Index: sys/conf/Makefile.kern.inc
===================================================================
RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.249
diff -p -u -r1.249 Makefile.kern.inc
--- sys/conf/Makefile.kern.inc	27 Nov 2015 20:59:47 -0000	1.249
+++ sys/conf/Makefile.kern.inc	9 Apr 2016 18:47:41 -0000
@@ -52,7 +52,7 @@ _MKTARGET_CREATE?=	:
 ##
 # source tree is located via $S relative to the compilation directory
 .ifndef S
-S!=	cd ../../../..; pwd
+S!=	cd ../../../.. && pwd
 .endif
 
 ##
@@ -229,12 +229,12 @@ LINKFLAGS?=	${LINKFORMAT} ${LINKSCRIPT} 
 
 LINKFLAGS_DEBUG?=	-X
 
-SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c; \
-		${SIZE} $@; chmod 755 $@; \
+SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
+		${SIZE} $@ && chmod 755 $@ && \
 		${SYSTEM_CTFMERGE}
-SYSTEM_LD_TAIL_DEBUG?=; \
-		echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+SYSTEM_LD_TAIL_DEBUG?=&& \
+		echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
+		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
 		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
 LINKFLAGS_NORMAL?=	-S
 STRIPFLAGS?=	-g
@@ -254,9 +254,9 @@ SYSTEM_LD_HEAD+=	${SYSTEM_LD_HEAD_EXTRA}
 SYSTEM_LD_TAIL_STAGE1=	${SYSTEM_LD_TAIL}
 SYSTEM_LD_TAIL_STAGE2=	${SYSTEM_LD_TAIL}
 .if defined(COPY_SYMTAB)
-SYSTEM_LD_TAIL_STAGE2+=	; echo ${DBSYM} $@; ${DBSYM} $@
+SYSTEM_LD_TAIL_STAGE2+=	&& echo ${DBSYM} $@ && ${DBSYM} $@
 .if !empty(DEBUG:M-g)
-SYSTEM_LD_TAIL_STAGE2+=	; echo ${DBSYM} $@.gdb; ${DBSYM} $@.gdb
+SYSTEM_LD_TAIL_STAGE2+=	&& echo ${DBSYM} $@.gdb && ${DBSYM} $@.gdb
 .endif
 .endif
 SYSTEM_LD_TAIL_STAGE2+=	${SYSTEM_LD_TAIL_EXTRA}