CVS commit: src

["Chuck Silvers" <chs%netbsd.org@localhost>]

Module Name:    src
Committed By:   chs
Date:           Mon Jul  6 00:21:51 UTC 2015

Modified Files:
        src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
        src/share/mk: sys.mk

Log Message:
reapply some fixes to make multi-threaded ctfmerge work
that were lost in the overzealous resync with freebsd.
remove the hacks which were applied to work around those problems.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
    src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
cvs rdiff -u -r1.127 -r1.128 src/share/mk/sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.