shithub: mc

Download patch

ref: c58ef1ca771d589312af243759012e66d1f00748
parent: 414e05cc376206936ddfe7cad6f21710839d8c3b
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Jul 31 19:14:43 EDT 2017

Update  bootstrap scripts.

--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@
 
 .PHONY: bootstrap
 bootstrap: buildmyr
-	cp mbld/mbld xmbld
 	./genbootstrap.sh
 
 buildmyr: subdirs
--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -2,4 +2,141 @@
 # This script is generated by genbootstrap.sh
 # to regenerate, run "make bootstrap"
 pwd=`pwd`
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/config.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/config.myr &&\
+echo 	as -g -o lib/thread/start.o lib/thread/start+osx-x64.s && 	as -g -o lib/thread/start.o lib/thread/start+osx-x64.s &&\
+echo 	as -g -o lib/thread/atomic-impl.o lib/thread/atomic-impl+x64.s && 	as -g -o lib/thread/atomic-impl.o lib/thread/atomic-impl+x64.s &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr &&\
+echo 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s && 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr &&\
+echo 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s && 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slfill.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slfill.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/clear.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/clear.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sjlj.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sjlj.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fltbits.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fltbits.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/option.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/option.myr &&\
+echo 	as -g -o lib/std/getbp.o lib/std/getbp+posixy-x64.s && 	as -g -o lib/std/getbp.o lib/std/getbp+posixy-x64.s &&\
+echo 	as -g -o lib/sys/syscall.o lib/sys/syscall+osx-x64.s && 	as -g -o lib/sys/syscall.o lib/sys/syscall+osx-x64.s &&\
+echo 	$pwd/6/6m lib/sys/systypes.myr && 	$pwd/6/6m lib/sys/systypes.myr &&\
+echo 	$pwd/6/6m lib/sys/sys+osx-x64.myr && 	$pwd/6/6m lib/sys/sys+osx-x64.myr &&\
+echo 	$pwd/6/6m lib/sys/ifreq+osx.myr && 	$pwd/6/6m lib/sys/ifreq+osx.myr &&\
+echo 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s && 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s &&\
+echo 	$pwd/6/6m lib/sys/syserrno+osx.myr && 	$pwd/6/6m lib/sys/syserrno+osx.myr &&\
+echo 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o && 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o &&\
+echo 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use && 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/strfind.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strfind.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/writeall.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/writeall.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/consts.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/consts.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/mkpath.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/mkpath.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/blat.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/blat.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/readall.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/readall.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/now.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/now.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/die.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/die.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slcp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slcp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap-ss+osx.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap-ss+osx.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleep.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleep.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/threadhooks.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/threadhooks.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/bytealloc.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/bytealloc.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/alloc.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/alloc.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/getcwd.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/getcwd.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slpop.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slpop.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/mk.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/mk.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/strjoin.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strjoin.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/htab.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/htab.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slput.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slput.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slpush.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slpush.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/slurp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/slurp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sljoin.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sljoin.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sldup.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sldup.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fndup.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fndup.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/dir+osx.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/dir+osx.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/diriter.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/diriter.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/dirname.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/dirname.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/putint.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/putint.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/utf.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/utf.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/strbuf.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strbuf.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/striter.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/striter.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/chartype.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/chartype.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/cmp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/cmp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/search.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/search.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hasprefix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hasprefix.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/bigint.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/bigint.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fltfmt.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fltfmt.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/chomp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/chomp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/intparse.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/intparse.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fltparse.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fltparse.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sort.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sort.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hashfuncs.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hashfuncs.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/bitset.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/bitset.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/strstrip.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strstrip.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/strsplit.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strsplit.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/getint.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/getint.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/introspect.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/introspect.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/varargs.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/varargs.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fmt.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fmt.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/pathjoin.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/pathjoin.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/try.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/try.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/netaddr.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/netaddr.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/env+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/env+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/execvp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/execvp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/iterutil.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/iterutil.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/assert.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/assert.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/rand.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/rand.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/mktemp.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/mktemp.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/optparse.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/optparse.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/ipparse.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/ipparse.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/resolve+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/resolve+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/dialparse+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/dialparse+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/listen+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/listen+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/dial+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/dial+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/fmtfuncs.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fmtfuncs.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/wait+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/wait+posixy.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/spork.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/spork.myr &&\
+echo 	ar -rcs lib/std/libstd.a lib/std/die.o lib/std/hassuffix.o lib/std/sldup.o lib/std/getbp.o lib/std/now.o lib/std/sljoin.o lib/std/readall.o lib/std/cstrconv.o lib/std/slurp.o lib/std/wait.o lib/std/dirname.o lib/std/option.o lib/std/errno.o lib/std/intparse.o lib/std/rand.o lib/std/introspect.o lib/std/syswrap.o lib/std/fltbits.o lib/std/fltparse.o lib/std/strstrip.o lib/std/dir.o lib/std/slpush.o lib/std/memops.o lib/std/ipparse.o lib/std/dialparse.o lib/std/execvp.o lib/std/sjlj.o lib/std/slput.o lib/std/getint.o lib/std/spork.o lib/std/htab.o lib/std/blat.o lib/std/alloc.o lib/std/optparse.o lib/std/chartype.o lib/std/varargs.o lib/std/backtrace.o lib/std/syswrap-ss.o lib/std/slfill.o lib/std/bytealloc.o lib/std/diriter.o lib/std/swap.o lib/std/assert.o lib/std/utf.o lib/std/sort.o lib/std/hashfuncs.o lib/std/clear.o lib/std/striter.o lib/std/dial.o lib/std/iterutil.o lib/std/strjoin.o lib/std/mk.o lib/std/mktemp.o lib/std/chomp.o lib/std/units.o lib/std/memops-impl.o lib/std/fndup.o lib/std/putint.o lib/std/types.o lib/std/mkpath.o lib/std/listen.o lib/std/bigint.o lib/std/fmtfuncs.o lib/std/env.o lib/std/fmt.o lib/std/resolve.o lib/std/extremum.o lib/std/consts.o lib/std/sleq.o lib/std/strbuf.o lib/std/threadhooks.o lib/std/slpop.o lib/std/sjlj-impl.o lib/std/result.o lib/std/strfind.o lib/std/slcp.o lib/std/netaddr.o lib/std/sleep.o lib/std/hasprefix.o lib/std/try.o lib/std/search.o lib/std/writeall.o lib/std/cmp.o lib/std/endian.o lib/std/getcwd.o lib/std/bitset.o lib/std/pathjoin.o lib/std/fltfmt.o lib/std/strsplit.o && 	ar -rcs lib/std/libstd.a lib/std/die.o lib/std/hassuffix.o lib/std/sldup.o lib/std/getbp.o lib/std/now.o lib/std/sljoin.o lib/std/readall.o lib/std/cstrconv.o lib/std/slurp.o lib/std/wait.o lib/std/dirname.o lib/std/option.o lib/std/errno.o lib/std/intparse.o lib/std/rand.o lib/std/introspect.o lib/std/syswrap.o lib/std/fltbits.o lib/std/fltparse.o lib/std/strstrip.o lib/std/dir.o lib/std/slpush.o lib/std/memops.o lib/std/ipparse.o lib/std/dialparse.o lib/std/execvp.o lib/std/sjlj.o lib/std/slput.o lib/std/getint.o lib/std/spork.o lib/std/htab.o lib/std/blat.o lib/std/alloc.o lib/std/optparse.o lib/std/chartype.o lib/std/varargs.o lib/std/backtrace.o lib/std/syswrap-ss.o lib/std/slfill.o lib/std/bytealloc.o lib/std/diriter.o lib/std/swap.o lib/std/assert.o lib/std/utf.o lib/std/sort.o lib/std/hashfuncs.o lib/std/clear.o lib/std/striter.o lib/std/dial.o lib/std/iterutil.o lib/std/strjoin.o lib/std/mk.o lib/std/mktemp.o lib/std/chomp.o lib/std/units.o lib/std/memops-impl.o lib/std/fndup.o lib/std/putint.o lib/std/types.o lib/std/mkpath.o lib/std/listen.o lib/std/bigint.o lib/std/fmtfuncs.o lib/std/env.o lib/std/fmt.o lib/std/resolve.o lib/std/extremum.o lib/std/consts.o lib/std/sleq.o lib/std/strbuf.o lib/std/threadhooks.o lib/std/slpop.o lib/std/sjlj-impl.o lib/std/result.o lib/std/strfind.o lib/std/slcp.o lib/std/netaddr.o lib/std/sleep.o lib/std/hasprefix.o lib/std/try.o lib/std/search.o lib/std/writeall.o lib/std/cmp.o lib/std/endian.o lib/std/getcwd.o lib/std/bitset.o lib/std/pathjoin.o lib/std/fltfmt.o lib/std/strsplit.o &&\
+echo 	$pwd/muse/muse -o lib/std/libstd.use -p std lib/std/die.use lib/std/hassuffix.use lib/std/sldup.use lib/std/now.use lib/std/sljoin.use lib/std/readall.use lib/std/cstrconv.use lib/std/slurp.use lib/std/wait.use lib/std/dirname.use lib/std/option.use lib/std/errno.use lib/std/intparse.use lib/std/rand.use lib/std/introspect.use lib/std/syswrap.use lib/std/fltbits.use lib/std/fltparse.use lib/std/strstrip.use lib/std/dir.use lib/std/slpush.use lib/std/memops.use lib/std/ipparse.use lib/std/dialparse.use lib/std/execvp.use lib/std/sjlj.use lib/std/slput.use lib/std/getint.use lib/std/spork.use lib/std/htab.use lib/std/blat.use lib/std/alloc.use lib/std/optparse.use lib/std/chartype.use lib/std/varargs.use lib/std/backtrace.use lib/std/syswrap-ss.use lib/std/slfill.use lib/std/bytealloc.use lib/std/diriter.use lib/std/swap.use lib/std/assert.use lib/std/utf.use lib/std/sort.use lib/std/hashfuncs.use lib/std/clear.use lib/std/striter.use lib/std/dial.use lib/std/iterutil.use lib/std/strjoin.use lib/std/mk.use lib/std/mktemp.use lib/std/chomp.use lib/std/units.use lib/std/fndup.use lib/std/putint.use lib/std/types.use lib/std/mkpath.use lib/std/listen.use lib/std/bigint.use lib/std/fmtfuncs.use lib/std/env.use lib/std/fmt.use lib/std/resolve.use lib/std/extremum.use lib/std/consts.use lib/std/sleq.use lib/std/strbuf.use lib/std/threadhooks.use lib/std/slpop.use lib/std/result.use lib/std/strfind.use lib/std/slcp.use lib/std/netaddr.use lib/std/sleep.use lib/std/hasprefix.use lib/std/try.use lib/std/search.use lib/std/writeall.use lib/std/cmp.use lib/std/endian.use lib/std/getcwd.use lib/std/bitset.use lib/std/pathjoin.use lib/std/fltfmt.use lib/std/strsplit.use && 	$pwd/muse/muse -o lib/std/libstd.use -p std lib/std/die.use lib/std/hassuffix.use lib/std/sldup.use lib/std/now.use lib/std/sljoin.use lib/std/readall.use lib/std/cstrconv.use lib/std/slurp.use lib/std/wait.use lib/std/dirname.use lib/std/option.use lib/std/errno.use lib/std/intparse.use lib/std/rand.use lib/std/introspect.use lib/std/syswrap.use lib/std/fltbits.use lib/std/fltparse.use lib/std/strstrip.use lib/std/dir.use lib/std/slpush.use lib/std/memops.use lib/std/ipparse.use lib/std/dialparse.use lib/std/execvp.use lib/std/sjlj.use lib/std/slput.use lib/std/getint.use lib/std/spork.use lib/std/htab.use lib/std/blat.use lib/std/alloc.use lib/std/optparse.use lib/std/chartype.use lib/std/varargs.use lib/std/backtrace.use lib/std/syswrap-ss.use lib/std/slfill.use lib/std/bytealloc.use lib/std/diriter.use lib/std/swap.use lib/std/assert.use lib/std/utf.use lib/std/sort.use lib/std/hashfuncs.use lib/std/clear.use lib/std/striter.use lib/std/dial.use lib/std/iterutil.use lib/std/strjoin.use lib/std/mk.use lib/std/mktemp.use lib/std/chomp.use lib/std/units.use lib/std/fndup.use lib/std/putint.use lib/std/types.use lib/std/mkpath.use lib/std/listen.use lib/std/bigint.use lib/std/fmtfuncs.use lib/std/env.use lib/std/fmt.use lib/std/resolve.use lib/std/extremum.use lib/std/consts.use lib/std/sleq.use lib/std/strbuf.use lib/std/threadhooks.use lib/std/slpop.use lib/std/result.use lib/std/strfind.use lib/std/slcp.use lib/std/netaddr.use lib/std/sleep.use lib/std/hasprefix.use lib/std/try.use lib/std/search.use lib/std/writeall.use lib/std/cmp.use lib/std/endian.use lib/std/getcwd.use lib/std/bitset.use lib/std/pathjoin.use lib/std/fltfmt.use lib/std/strsplit.use &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/types.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/types.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/common.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/common.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/atomic.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/atomic.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/mutex.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/mutex.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/hookstd.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/hookstd.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/ncpu.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/ncpu.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/spawn+osx.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/thread/spawn+osx.myr &&\
+echo 	ar -rcs lib/thread/libthread.a lib/thread/mutex.o lib/thread/spawn.o lib/thread/ncpu.o lib/thread/hookstd.o lib/thread/atomic-impl.o lib/thread/start.o lib/thread/atomic.o lib/thread/common.o && 	ar -rcs lib/thread/libthread.a lib/thread/mutex.o lib/thread/spawn.o lib/thread/ncpu.o lib/thread/hookstd.o lib/thread/atomic-impl.o lib/thread/start.o lib/thread/atomic.o lib/thread/common.o &&\
+echo 	$pwd/muse/muse -o lib/thread/libthread.use -p thread lib/thread/mutex.use lib/thread/spawn.use lib/thread/ncpu.use lib/thread/hookstd.use lib/thread/atomic.use lib/thread/common.use && 	$pwd/muse/muse -o lib/thread/libthread.use -p thread lib/thread/mutex.use lib/thread/spawn.use lib/thread/ncpu.use lib/thread/hookstd.use lib/thread/atomic.use lib/thread/common.use &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/opts.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/opts.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr &&\
+echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr &&\
+echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/mem.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/mem.myr &&\
+echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/puti.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/puti.myr &&\
+echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/iter.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/iter.myr &&\
+echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/geti.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/geti.myr &&\
+echo 	ar -rcs lib/bio/libbio.a lib/bio/bio.o lib/bio/geti.o lib/bio/iter.o lib/bio/puti.o lib/bio/mem.o && 	ar -rcs lib/bio/libbio.a lib/bio/bio.o lib/bio/geti.o lib/bio/iter.o lib/bio/puti.o lib/bio/mem.o &&\
+echo 	$pwd/muse/muse -o lib/bio/libbio.use -p bio lib/bio/bio.use lib/bio/geti.use lib/bio/iter.use lib/bio/puti.use lib/bio/mem.use && 	$pwd/muse/muse -o lib/bio/libbio.use -p bio lib/bio/bio.use lib/bio/geti.use lib/bio/iter.use lib/bio/puti.use lib/bio/mem.use &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/libs.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/libs.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/types.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/types.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/interp.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/interp.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/ranges.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/ranges.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/compile.myr && 	$pwd/6/6m -I lib/sys -I lib/std lib/regex/compile.myr &&\
+echo 	ar -rcs lib/regex/libregex.a lib/regex/interp.o lib/regex/ranges.o lib/regex/compile.o lib/regex/types.o && 	ar -rcs lib/regex/libregex.a lib/regex/interp.o lib/regex/ranges.o lib/regex/compile.o lib/regex/types.o &&\
+echo 	$pwd/muse/muse -o lib/regex/libregex.use -p regex lib/regex/interp.use lib/regex/ranges.use lib/regex/compile.use lib/regex/types.use && 	$pwd/muse/muse -o lib/regex/libregex.use -p regex lib/regex/interp.use lib/regex/ranges.use lib/regex/compile.use lib/regex/types.use &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/deps.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/deps.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr &&\
+echo 	ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys -macosx_version_min 10.6 && 	ld -pagezero_size 0x100000000 -macosx_version_min 10.6 -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys -macosx_version_min 10.6 &&\
 true
--- a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
@@ -8,8 +8,6 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr &&\
 echo 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s && 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr &&\
 echo 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s && 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr &&\
@@ -32,6 +30,8 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr &&\
@@ -117,6 +117,7 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr &&\
 echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr &&\
@@ -137,5 +138,5 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr &&\
-echo 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
+echo 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
 true
--- a/mk/bootstrap/bootstrap+NetBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+NetBSD-amd64.sh
@@ -7,8 +7,6 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr &&\
 echo 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s && 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr &&\
 echo 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s && 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr &&\
@@ -31,6 +29,8 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr &&\
@@ -116,6 +116,7 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr &&\
 echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr &&\
@@ -136,5 +137,5 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr &&\
-echo 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
+echo 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
 true
--- a/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
@@ -8,18 +8,6 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/endian.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/result.myr &&\
 echo 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s && 	as -g -o lib/std/sjlj-impl.o lib/std/sjlj-impl+posixy-x64.s &&\
-echo 	$pwd/6/6m lib/sys/ifreq+openbsd.myr && 	$pwd/6/6m lib/sys/ifreq+openbsd.myr &&\
-echo 	as -g -o lib/sys/syscall.o lib/sys/syscall+openbsd-x64.s && 	as -g -o lib/sys/syscall.o lib/sys/syscall+openbsd-x64.s &&\
-echo 	$pwd/6/6m lib/sys/systypes.myr && 	$pwd/6/6m lib/sys/systypes.myr &&\
-echo 	$pwd/6/6m lib/sys/sys+openbsd-x64.myr && 	$pwd/6/6m lib/sys/sys+openbsd-x64.myr &&\
-echo 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s && 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s &&\
-echo 	$pwd/6/6m lib/sys/syserrno+openbsd.myr && 	$pwd/6/6m lib/sys/syserrno+openbsd.myr &&\
-echo 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o && 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o &&\
-echo 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use && 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
-echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/extremum.myr &&\
 echo 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s && 	as -g -o lib/std/memops-impl.o lib/std/memops-impl+posixy-x64.s &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/swap.myr &&\
@@ -29,9 +17,21 @@
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/fltbits.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/fltbits.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/option.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/option.myr &&\
 echo 	as -g -o lib/std/getbp.o lib/std/getbp+posixy-x64.s && 	as -g -o lib/std/getbp.o lib/std/getbp+posixy-x64.s &&\
+echo 	$pwd/6/6m lib/sys/ifreq+openbsd.myr && 	$pwd/6/6m lib/sys/ifreq+openbsd.myr &&\
+echo 	as -g -o lib/sys/syscall.o lib/sys/syscall+openbsd-x64.s && 	as -g -o lib/sys/syscall.o lib/sys/syscall+openbsd-x64.s &&\
+echo 	$pwd/6/6m lib/sys/systypes.myr && 	$pwd/6/6m lib/sys/systypes.myr &&\
+echo 	$pwd/6/6m lib/sys/sys+openbsd-x64.myr && 	$pwd/6/6m lib/sys/sys+openbsd-x64.myr &&\
+echo 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s && 	as -g -o lib/sys/util.o lib/sys/util+posixy-x64.s &&\
+echo 	$pwd/6/6m lib/sys/syserrno+openbsd.myr && 	$pwd/6/6m lib/sys/syserrno+openbsd.myr &&\
+echo 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o && 	ar -rcs lib/sys/libsys.a lib/sys/syserrno.o lib/sys/util.o lib/sys/sys.o lib/sys/systypes.o lib/sys/syscall.o lib/sys/ifreq.o &&\
+echo 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use && 	$pwd/muse/muse -o lib/sys/libsys.use -p sys lib/sys/syserrno.use lib/sys/sys.use lib/sys/systypes.use lib/sys/ifreq.use &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/types.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/strfind.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/strfind.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/units.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/backtrace+x64.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/memops.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/sleq.myr &&\
+echo 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/cstrconv.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/errno.myr &&\
 echo 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr && 	$pwd/6/6m -I . -I lib/sys lib/std/syswrap+posixy.myr &&\
@@ -117,6 +117,7 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr &&\
+echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr &&\
 echo 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr && 	$pwd/6/6m -I lib/std -I lib/sys lib/bio/bio.myr &&\
@@ -137,5 +138,5 @@
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr &&\
 echo 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr && 	$pwd/6/6m -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr &&\
-echo 	ld -static -nopie -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -static -nopie -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
+echo 	ld -static -nopie -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys && 	ld -static -nopie -o mbld/mbld $pwd/rt/_myrrt.o mbld/types.o mbld/config.o mbld/build.o mbld/libs.o mbld/install.o mbld/test.o mbld/util.o mbld/main.o mbld/subtest.o mbld/clean.o mbld/opts.o mbld/parse.o mbld/syssel.o mbld/deps.o -Llib/thread -lthread -Llib/regex -lregex -Llib/bio -lbio -Llib/std -lstd -Llib/sys -lsys &&\
 true
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -7,8 +7,6 @@
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/endian.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/endian.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/result.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/result.myr &&\
 echo 	6a -o lib/std/sjlj-impl.6 lib/std/sjlj-impl+plan9-x64.s && 	6a -o lib/std/sjlj-impl.6 lib/std/sjlj-impl+plan9-x64.s &&\
-echo 	$pwd/6/6.out -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/sleq.myr &&\
-echo 	$pwd/6/6.out -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/extremum.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/extremum.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/resolve+plan9.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/resolve+plan9.myr &&\
 echo 	6a -o lib/std/memops-impl.6 lib/std/memops-impl+plan9-x64.s && 	6a -o lib/std/memops-impl.6 lib/std/memops-impl+plan9-x64.s &&\
@@ -32,6 +30,8 @@
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/units.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/units.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/backtrace+x64.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/backtrace+x64.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/memops.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/memops.myr &&\
+echo 	$pwd/6/6.out -I . -I lib/sys lib/std/sleq.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/sleq.myr &&\
+echo 	$pwd/6/6.out -I . -I lib/sys lib/std/hassuffix.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/hassuffix.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/cstrconv.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/cstrconv.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/syswrap-ss+plan9.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/syswrap-ss+plan9.myr &&\
 echo 	$pwd/6/6.out -I . -I lib/sys lib/std/sleep.myr && 	$pwd/6/6.out -I . -I lib/sys lib/std/sleep.myr &&\
@@ -113,6 +113,7 @@
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/syssel.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/util.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/parse.myr &&\
+echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/clean.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/build.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/install.myr &&\
 echo 	$pwd/6/6.out -I lib/std -I lib/sys lib/bio/bio.myr && 	$pwd/6/6.out -I lib/std -I lib/sys lib/bio/bio.myr &&\
@@ -133,5 +134,5 @@
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/subtest.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/test.myr &&\
 echo 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr && 	$pwd/6/6.out -I lib/sys -I lib/std -I lib/bio -I lib/regex -I lib/thread mbld/main.myr &&\
-echo 	6l -lo mbld/mbld $pwd/rt/_myrrt.6 mbld/types.6 mbld/config.6 mbld/build.6 mbld/libs.6 mbld/install.6 mbld/test.6 mbld/util.6 mbld/main.6 mbld/subtest.6 mbld/opts.6 mbld/parse.6 mbld/syssel.6 mbld/deps.6 lib/thread/libthread.a lib/regex/libregex.a lib/bio/libbio.a lib/std/libstd.a lib/sys/libsys.a && 	6l -lo mbld/mbld $pwd/rt/_myrrt.6 mbld/types.6 mbld/config.6 mbld/build.6 mbld/libs.6 mbld/install.6 mbld/test.6 mbld/util.6 mbld/main.6 mbld/subtest.6 mbld/opts.6 mbld/parse.6 mbld/syssel.6 mbld/deps.6 lib/thread/libthread.a lib/regex/libregex.a lib/bio/libbio.a lib/std/libstd.a lib/sys/libsys.a &&\
+echo 	6l -lo mbld/mbld $pwd/rt/_myrrt.6 mbld/types.6 mbld/config.6 mbld/build.6 mbld/libs.6 mbld/install.6 mbld/test.6 mbld/util.6 mbld/main.6 mbld/subtest.6 mbld/clean.6 mbld/opts.6 mbld/parse.6 mbld/syssel.6 mbld/deps.6 lib/thread/libthread.a lib/regex/libregex.a lib/bio/libbio.a lib/std/libstd.a lib/sys/libsys.a && 	6l -lo mbld/mbld $pwd/rt/_myrrt.6 mbld/types.6 mbld/config.6 mbld/build.6 mbld/libs.6 mbld/install.6 mbld/test.6 mbld/util.6 mbld/main.6 mbld/subtest.6 mbld/clean.6 mbld/opts.6 mbld/parse.6 mbld/syssel.6 mbld/deps.6 lib/thread/libthread.a lib/regex/libregex.a lib/bio/libbio.a lib/std/libstd.a lib/sys/libsys.a &&\
 true