ref: 38a4c78511a5aea2608ea44bbfde055485197b50
parent: b6cc5894e7c326a0dccb27f7b8347dbe56df6595
author: Ori Bernstein <ori@eigenstate.org>
date: Wed May 4 11:12:54 EDT 2016
Update plan9 bootstrap
--- a/lib/std/env+plan9.myr
+++ b/lib/std/env+plan9.myr
@@ -35,7 +35,6 @@
}
const getenv = {name- var buf : byte[128]
var s, ret
match envfind(name)
@@ -42,7 +41,7 @@
| `Some val:
ret = `Some val
| `None:
- s = bfmt(buf[:], "/env/{}", name)+ s = fmt("/env/{}", name)match std.slurp(s)
| `Fail m:
ret = `None
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -23,8 +23,9 @@
echo $pwd/6/6.out -I ../sys -I . sleq.myr && $pwd/6/6.out -I ../sys -I . sleq.myr &&\
echo $pwd/6/6.out -I ../sys -I . hassuffix.myr && $pwd/6/6.out -I ../sys -I . hassuffix.myr &&\
echo $pwd/6/6.out -I ../sys -I . extremum.myr && $pwd/6/6.out -I ../sys -I . extremum.myr &&\
-echo $pwd/6/6.out -I ../sys -I . units.myr && $pwd/6/6.out -I ../sys -I . units.myr &&\
echo $pwd/6/6.out -I ../sys -I . memops.myr && $pwd/6/6.out -I ../sys -I . memops.myr &&\
+echo $pwd/6/6.out -I ../sys -I . threadhooks.myr && $pwd/6/6.out -I ../sys -I . threadhooks.myr &&\
+echo $pwd/6/6.out -I ../sys -I . units.myr && $pwd/6/6.out -I ../sys -I . units.myr &&\
echo $pwd/6/6.out -I ../sys -I . alloc.myr && $pwd/6/6.out -I ../sys -I . alloc.myr &&\
echo $pwd/6/6.out -I ../sys -I . consts.myr && $pwd/6/6.out -I ../sys -I . consts.myr &&\
echo $pwd/6/6.out -I ../sys -I . chartype.myr && $pwd/6/6.out -I ../sys -I . chartype.myr &&\
@@ -53,6 +54,7 @@
echo $pwd/6/6.out -I ../sys -I . now.myr && $pwd/6/6.out -I ../sys -I . now.myr &&\
echo $pwd/6/6.out -I ../sys -I . rand.myr && $pwd/6/6.out -I ../sys -I . rand.myr &&\
echo $pwd/6/6.out -I ../sys -I . sljoin.myr && $pwd/6/6.out -I ../sys -I . sljoin.myr &&\
+echo $pwd/6/6.out -I ../sys -I . readall.myr && $pwd/6/6.out -I ../sys -I . readall.myr &&\
echo $pwd/6/6.out -I ../sys -I . slurp.myr && $pwd/6/6.out -I ../sys -I . slurp.myr &&\
echo $pwd/6/6.out -I ../sys -I . dirname.myr && $pwd/6/6.out -I ../sys -I . dirname.myr &&\
echo $pwd/6/6.out -I ../sys -I . optparse.myr && $pwd/6/6.out -I ../sys -I . optparse.myr &&\
@@ -87,8 +89,8 @@
echo $pwd/6/6.out -I ../sys -I . swap.myr && $pwd/6/6.out -I ../sys -I . swap.myr &&\
echo $pwd/6/6.out -I ../sys -I . dial+plan9.myr && $pwd/6/6.out -I ../sys -I . dial+plan9.myr &&\
echo 6a -o memops-impl.6 memops-impl+plan9-x64.s && 6a -o memops-impl.6 memops-impl+plan9-x64.s &&\
-echo $pwd/muse/6.out -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use syswrap-ss.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use env.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use resolve.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use writeall.use putint.use consts.use sort.use blat.use diriter.use mk.use errno.use hassuffix.use execvp.use swap.use ipparse.use types.use slpop.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use result.use bitset.use intparse.use hasprefix.use mkpath.use getint.use syswrap.use dirname.use sleq.use endian.use iterutil.use spork.use dial.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use && $pwd/muse/6.out -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use syswrap-ss.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use env.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use resolve.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use writeall.use putint.use consts.use sort.use blat.use diriter.use mk.use errno.use hassuffix.use execvp.use swap.use ipparse.use types.use slpop.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use result.use bitset.use intparse.use hasprefix.use mkpath.use getint.use syswrap.use dirname.use sleq.use endian.use iterutil.use spork.use dial.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use &&\
-echo ar vu libstd.a fmtfuncs.6 fmt.6 try.6 pathjoin.6 strjoin.6 dir.6 syswrap-ss.6 sljoin.6 slpush.6 strstrip.6 htab.6 now.6 getcwd.6 rand.6 env.6 slurp.6 varargs.6 strbuf.6 clear.6 slput.6 strsplit.6 introspect.6 resolve.6 mktemp.6 alloc.6 optparse.6 memops.6 fltbits.6 striter.6 sldup.6 fltfmt.6 extremum.6 option.6 slcp.6 writeall.6 putint.6 consts.6 sort.6 blat.6 diriter.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 ipparse.6 types.6 slpop.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 result.6 bitset.6 intparse.6 hasprefix.6 mkpath.6 getint.6 syswrap.6 dirname.6 sleq.6 endian.6 iterutil.6 spork.6 dial.6 assert.6 cmp.6 chartype.6 memops-impl.6 bigint.6 hashfuncs.6 slfill.6 fndup.6 && ar vu libstd.a fmtfuncs.6 fmt.6 try.6 pathjoin.6 strjoin.6 dir.6 syswrap-ss.6 sljoin.6 slpush.6 strstrip.6 htab.6 now.6 getcwd.6 rand.6 env.6 slurp.6 varargs.6 strbuf.6 clear.6 slput.6 strsplit.6 introspect.6 resolve.6 mktemp.6 alloc.6 optparse.6 memops.6 fltbits.6 striter.6 sldup.6 fltfmt.6 extremum.6 option.6 slcp.6 writeall.6 putint.6 consts.6 sort.6 blat.6 diriter.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 ipparse.6 types.6 slpop.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 result.6 bitset.6 intparse.6 hasprefix.6 mkpath.6 getint.6 syswrap.6 dirname.6 sleq.6 endian.6 iterutil.6 spork.6 dial.6 assert.6 cmp.6 chartype.6 memops-impl.6 bigint.6 hashfuncs.6 slfill.6 fndup.6 &&\
+echo $pwd/muse/6.out -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use syswrap-ss.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use env.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use resolve.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use writeall.use putint.use consts.use readall.use sort.use blat.use diriter.use mk.use errno.use hassuffix.use execvp.use swap.use ipparse.use types.use slpop.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use result.use bitset.use intparse.use hasprefix.use mkpath.use getint.use syswrap.use dirname.use sleq.use endian.use iterutil.use spork.use dial.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use && $pwd/muse/6.out -o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use syswrap-ss.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use env.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use resolve.use mktemp.use alloc.use optparse.use memops.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use slcp.use writeall.use putint.use consts.use readall.use sort.use blat.use diriter.use mk.use errno.use hassuffix.use execvp.use swap.use ipparse.use types.use slpop.use strfind.use utf.use cstrconv.use search.use die.use units.use wait.use result.use bitset.use intparse.use hasprefix.use mkpath.use getint.use syswrap.use dirname.use sleq.use endian.use iterutil.use spork.use dial.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use &&\
+echo ar vu libstd.a fmtfuncs.6 fmt.6 try.6 pathjoin.6 strjoin.6 dir.6 syswrap-ss.6 sljoin.6 slpush.6 strstrip.6 htab.6 now.6 getcwd.6 rand.6 env.6 slurp.6 varargs.6 strbuf.6 clear.6 slput.6 strsplit.6 introspect.6 resolve.6 mktemp.6 alloc.6 optparse.6 memops.6 fltbits.6 striter.6 sldup.6 fltfmt.6 extremum.6 option.6 slcp.6 writeall.6 putint.6 consts.6 readall.6 sort.6 blat.6 diriter.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 ipparse.6 types.6 slpop.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 result.6 bitset.6 intparse.6 hasprefix.6 mkpath.6 getint.6 syswrap.6 dirname.6 sleq.6 endian.6 iterutil.6 spork.6 dial.6 assert.6 cmp.6 chartype.6 memops-impl.6 bigint.6 hashfuncs.6 slfill.6 threadhooks.6 fndup.6 && ar vu libstd.a fmtfuncs.6 fmt.6 try.6 pathjoin.6 strjoin.6 dir.6 syswrap-ss.6 sljoin.6 slpush.6 strstrip.6 htab.6 now.6 getcwd.6 rand.6 env.6 slurp.6 varargs.6 strbuf.6 clear.6 slput.6 strsplit.6 introspect.6 resolve.6 mktemp.6 alloc.6 optparse.6 memops.6 fltbits.6 striter.6 sldup.6 fltfmt.6 extremum.6 option.6 slcp.6 writeall.6 putint.6 consts.6 readall.6 sort.6 blat.6 diriter.6 mk.6 errno.6 hassuffix.6 execvp.6 swap.6 ipparse.6 types.6 slpop.6 strfind.6 utf.6 cstrconv.6 search.6 die.6 units.6 wait.6 result.6 bitset.6 intparse.6 hasprefix.6 mkpath.6 getint.6 syswrap.6 dirname.6 sleq.6 endian.6 iterutil.6 spork.6 dial.6 assert.6 cmp.6 chartype.6 memops-impl.6 bigint.6 hashfuncs.6 slfill.6 threadhooks.6 fndup.6 &&\
echo cd $pwd/lib/regex && cd $pwd/lib/regex &&\
echo $pwd/6/6.out -I ../std -I ../sys types.myr && $pwd/6/6.out -I ../std -I ../sys types.myr &&\
echo $pwd/6/6.out -I ../std -I ../sys interp.myr && $pwd/6/6.out -I ../std -I ../sys interp.myr &&\