CVS commit: [netbsd-7] src

["Soren Jacobsen" <snj%netbsd.org@localhost>]

Module Name:    src
Committed By:   snj
Date:           Thu Jul 16 21:52:28 UTC 2015

Modified Files:
        src/external/cddl/osnet/dist/tools/ctf/cvt [netbsd-7]: ctfmerge.c
        src/share/mk [netbsd-7]: sys.mk

Log Message:
Pull up following revision(s) (requested by chs in ticket #866):
        external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c: revision 1.12 via patch
        share/mk/sys.mk: revision 1.128
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.9 -r1.9.4.1 \
    src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
cvs rdiff -u -r1.127 -r1.127.2.1 src/share/mk/sys.mk

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