shithub: mc

Download patch

ref: 420aa87291660b3452f42d637227b157dbf86846
parent: 2533822d0fb51d2aedf941bac59d492acc1036a1
author: Ori Bernstein <ori@eigenstate.org>
date: Mon Jan 20 18:40:23 EST 2020

fix bootstrap on 9front

diff -u a/mk/bootstrap/bootstrap+Plan9-amd64.sh b/mk/bootstrap/bootstrap+Plan9-amd64.sh
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -85,9 +85,9 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/slpush.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/striter.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intparse.myr
-	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strsplit.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strbuf.myr
+	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/sldup.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/bigint.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fltparse.myr
@@ -124,8 +124,8 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/ipparse.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fmtfuncs.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/try.myr
-	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
-	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
+	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/intfmt.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
+	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/intfmt.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std -I obj/lib/bio -I obj/lib/regex -I obj/lib/thread mbld/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/interp.myr
diff -u a/mk/bootstrap/bootstrap+Plan9-amd64.sh b/mk/bootstrap/bootstrap+Plan9-amd64.sh
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -85,9 +85,9 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/slpush.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/striter.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intparse.myr
-	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strsplit.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strbuf.myr
+	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/sldup.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/bigint.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fltparse.myr
@@ -124,8 +124,8 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/ipparse.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fmtfuncs.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/try.myr
-	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
-	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
+	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/intfmt.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
+	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/intfmt.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std -I obj/lib/bio -I obj/lib/regex -I obj/lib/thread mbld/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/interp.myr
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -85,9 +85,9 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/slpush.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/striter.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intparse.myr
-	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strsplit.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/strbuf.myr
+	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/intfmt.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/sldup.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/bigint.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fltparse.myr
@@ -124,8 +124,8 @@
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/ipparse.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/fmtfuncs.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys lib/std/try.myr
-	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
-	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
+	ar u obj/lib/std/libstd.a obj/lib/std/resolve.6 obj/lib/std/intfmt.6 obj/lib/std/result.6 obj/lib/std/try.6 obj/lib/std/ipparse.6 obj/lib/std/alloc.6 obj/lib/std/sleq.6 obj/lib/std/putint.6 obj/lib/std/sljoin.6 obj/lib/std/slpop.6 obj/lib/std/syswrap.6 obj/lib/std/getint.6 obj/lib/std/strsplit.6 obj/lib/std/slfill.6 obj/lib/std/writeall.6 obj/lib/std/fltfmt.6 obj/lib/std/hasprefix.6 obj/lib/std/swap.6 obj/lib/std/fmt.6 obj/lib/std/netaddr.6 obj/lib/std/varargs.6 obj/lib/std/diriter.6 obj/lib/std/getcwd.6 obj/lib/std/blat.6 obj/lib/std/optparse.6 obj/lib/std/pathjoin.6 obj/lib/std/readall.6 obj/lib/std/strjoin.6 obj/lib/std/threadhooks.6 obj/lib/std/sjlj.6 obj/lib/std/extremum.6 obj/lib/std/endian.6 obj/lib/std/rand.6 obj/lib/std/sldup.6 obj/lib/std/sleep.6 obj/lib/std/wait.6 obj/lib/std/introspect.6 obj/lib/std/fltparse.6 obj/lib/std/fndup.6 obj/lib/std/strbuf.6 obj/lib/std/strreplace.6 obj/lib/std/assert.6 obj/lib/std/spork.6 obj/lib/std/slpush.6 obj/lib/std/strstrip.6 obj/lib/std/htab.6 obj/lib/std/hashfuncs.6 obj/lib/std/slput.6 obj/lib/std/sjlj-impl.6 obj/lib/std/fltbits.6 obj/lib/std/striter.6 obj/lib/std/types.6 obj/lib/std/cstrconv.6 obj/lib/std/units.6 obj/lib/std/backtrace.6 obj/lib/std/syswrap-ss.6 obj/lib/std/die.6 obj/lib/std/mk.6 obj/lib/std/hassuffix.6 obj/lib/std/memops-impl.6 obj/lib/std/pledge.6 obj/lib/std/utf.6 obj/lib/std/slurp.6 obj/lib/std/bytealloc.6 obj/lib/std/mktemp.6 obj/lib/std/consts.6 obj/lib/std/chomp.6 obj/lib/std/dir.6 obj/lib/std/search.6 obj/lib/std/memops.6 obj/lib/std/fmtfuncs.6 obj/lib/std/strfind.6 obj/lib/std/env.6 obj/lib/std/dirname.6 obj/lib/std/clear.6 obj/lib/std/listen.6 obj/lib/std/sort.6 obj/lib/std/cmp.6 obj/lib/std/now.6 obj/lib/std/intparse.6 obj/lib/std/traits.6 obj/lib/std/mkpath.6 obj/lib/std/option.6 obj/lib/std/dial.6 obj/lib/std/errno.6 obj/lib/std/chartype.6 obj/lib/std/bigint.6 obj/lib/std/bitset.6 obj/lib/std/getbp.6 obj/lib/std/slcp.6 obj/lib/std/execvp.6
+	$pwd/muse/6.out -o obj/lib/std/libstd.use -p std obj/lib/std/resolve.use obj/lib/std/intfmt.use obj/lib/std/result.use obj/lib/std/try.use obj/lib/std/ipparse.use obj/lib/std/alloc.use obj/lib/std/sleq.use obj/lib/std/putint.use obj/lib/std/sljoin.use obj/lib/std/slpop.use obj/lib/std/syswrap.use obj/lib/std/getint.use obj/lib/std/strsplit.use obj/lib/std/slfill.use obj/lib/std/writeall.use obj/lib/std/fltfmt.use obj/lib/std/hasprefix.use obj/lib/std/swap.use obj/lib/std/fmt.use obj/lib/std/netaddr.use obj/lib/std/varargs.use obj/lib/std/diriter.use obj/lib/std/getcwd.use obj/lib/std/blat.use obj/lib/std/optparse.use obj/lib/std/pathjoin.use obj/lib/std/readall.use obj/lib/std/strjoin.use obj/lib/std/threadhooks.use obj/lib/std/sjlj.use obj/lib/std/extremum.use obj/lib/std/endian.use obj/lib/std/rand.use obj/lib/std/sldup.use obj/lib/std/sleep.use obj/lib/std/wait.use obj/lib/std/introspect.use obj/lib/std/fltparse.use obj/lib/std/fndup.use obj/lib/std/strbuf.use obj/lib/std/strreplace.use obj/lib/std/assert.use obj/lib/std/spork.use obj/lib/std/slpush.use obj/lib/std/strstrip.use obj/lib/std/htab.use obj/lib/std/hashfuncs.use obj/lib/std/slput.use obj/lib/std/fltbits.use obj/lib/std/striter.use obj/lib/std/types.use obj/lib/std/cstrconv.use obj/lib/std/units.use obj/lib/std/backtrace.use obj/lib/std/syswrap-ss.use obj/lib/std/die.use obj/lib/std/mk.use obj/lib/std/hassuffix.use obj/lib/std/pledge.use obj/lib/std/utf.use obj/lib/std/slurp.use obj/lib/std/bytealloc.use obj/lib/std/mktemp.use obj/lib/std/consts.use obj/lib/std/chomp.use obj/lib/std/dir.use obj/lib/std/search.use obj/lib/std/memops.use obj/lib/std/fmtfuncs.use obj/lib/std/strfind.use obj/lib/std/env.use obj/lib/std/dirname.use obj/lib/std/clear.use obj/lib/std/listen.use obj/lib/std/sort.use obj/lib/std/cmp.use obj/lib/std/now.use obj/lib/std/intparse.use obj/lib/std/traits.use obj/lib/std/mkpath.use obj/lib/std/option.use obj/lib/std/dial.use obj/lib/std/errno.use obj/lib/std/chartype.use obj/lib/std/bigint.use obj/lib/std/bitset.use obj/lib/std/slcp.use obj/lib/std/execvp.use
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std -I obj/lib/bio -I obj/lib/regex -I obj/lib/thread mbld/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/types.myr
 	$pwd/6/6.out -O obj -I obj/lib/sys -I obj/lib/std lib/regex/interp.myr