ref: 1b56041cec12b718c7c049d7739ffe73f0fcd53b
parent: e5784c0a7fe51aa70d64026ea7c3e7cf49fe634b
author: Ori Bernstein <ori@eigenstate.org>
date: Sat May 14 09:29:45 EDT 2016
Update 9front build/bootstrap.
--- a/6/genp9.c
+++ b/6/genp9.c
@@ -317,19 +317,19 @@
return 0;
switch (b->type) {case Bti8:
- fprintf(fd, "\tDATA %s+%zd(SB)/1,$%llu\n", lbl, off+n, b->ival);
+ fprintf(fd, "\tDATA %s+%zd(SB)/1,$%lld\n", lbl, off+n, b->ival);
n += 1;
break;
case Bti16:
- fprintf(fd, "\tDATA %s+%zd(SB)/2,$%llu\n", lbl, off+n, b->ival);
+ fprintf(fd, "\tDATA %s+%zd(SB)/2,$%lld\n", lbl, off+n, b->ival);
n += 2;
break;
case Bti32:
- fprintf(fd, "\tDATA %s+%zd(SB)/4,$%llu\n", lbl, off+n, b->ival);
+ fprintf(fd, "\tDATA %s+%zd(SB)/4,$%lld\n", lbl, off+n, b->ival);
n += 4;
break;
case Bti64:
- fprintf(fd, "\tDATA %s+%zd(SB)/8,$%llu\n", lbl, off+n, (vlong)b->ival);
+ fprintf(fd, "\tDATA %s+%zd(SB)/8,$%lld\n", lbl, off+n, (vlong)b->ival);
n += 8;
break;
case Btimin:
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -8,8 +8,8 @@
echo $pwd/6/6.out ifreq+plan9.myr && $pwd/6/6.out ifreq+plan9.myr &&\
echo 6a -o util.6 util+plan9-x64.s && 6a -o util.6 util+plan9-x64.s &&\
echo 6a -o syscall.6 syscall+plan9-x64.s && 6a -o syscall.6 syscall+plan9-x64.s &&\
-echo $pwd/muse/6.out -o sys sys.use ifreq.use systypes.use && $pwd/muse/6.out -o sys sys.use ifreq.use systypes.use &&\
-echo ar vu libsys.a sys.6 ifreq.6 syscall.6 systypes.6 util.6 && ar vu libsys.a sys.6 ifreq.6 syscall.6 systypes.6 util.6 &&\
+echo $pwd/muse/6.out -o libsys.use -p sys sys.use ifreq.use systypes.use && $pwd/muse/6.out -o libsys.use -p sys sys.use ifreq.use systypes.use &&\
+echo ar vu libsys.a sys.6 ifreq.6 systypes.6 syscall.6 util.6 && ar vu libsys.a sys.6 ifreq.6 systypes.6 syscall.6 util.6 &&\
echo cd $pwd/lib/std && cd $pwd/lib/std &&\
echo $pwd/6/6.out -I ../sys -I . option.myr && $pwd/6/6.out -I ../sys -I . option.myr &&\
echo $pwd/6/6.out -I ../sys -I . types.myr && $pwd/6/6.out -I ../sys -I . types.myr &&\
@@ -89,7 +89,7 @@
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 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 $pwd/muse/6.out -o libstd.use -p 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 libstd.use -p 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 &&\
@@ -96,7 +96,7 @@
echo $pwd/6/6.out -I ../std -I ../sys interp.myr && $pwd/6/6.out -I ../std -I ../sys interp.myr &&\
echo $pwd/6/6.out -I ../std -I ../sys ranges.myr && $pwd/6/6.out -I ../std -I ../sys ranges.myr &&\
echo $pwd/6/6.out -I ../std -I ../sys compile.myr && $pwd/6/6.out -I ../std -I ../sys compile.myr &&\
-echo $pwd/muse/6.out -o regex interp.use types.use compile.use ranges.use && $pwd/muse/6.out -o regex interp.use types.use compile.use ranges.use &&\
+echo $pwd/muse/6.out -o libregex.use -p regex interp.use types.use compile.use ranges.use && $pwd/muse/6.out -o libregex.use -p regex interp.use types.use compile.use ranges.use &&\
echo ar vu libregex.a interp.6 types.6 compile.6 ranges.6 && ar vu libregex.a interp.6 types.6 compile.6 ranges.6 &&\
echo cd $pwd/lib/bio && cd $pwd/lib/bio &&\
echo $pwd/6/6.out -I ../sys -I ../std bio.myr && $pwd/6/6.out -I ../sys -I ../std bio.myr &&\
@@ -103,7 +103,7 @@
echo $pwd/6/6.out -I ../sys -I ../std puti.myr && $pwd/6/6.out -I ../sys -I ../std puti.myr &&\
echo $pwd/6/6.out -I ../sys -I ../std iter.myr && $pwd/6/6.out -I ../sys -I ../std iter.myr &&\
echo $pwd/6/6.out -I ../sys -I ../std geti.myr && $pwd/6/6.out -I ../sys -I ../std geti.myr &&\
-echo $pwd/muse/6.out -o bio puti.use bio.use geti.use iter.use && $pwd/muse/6.out -o bio puti.use bio.use geti.use iter.use &&\
+echo $pwd/muse/6.out -o libbio.use -p bio puti.use bio.use geti.use iter.use && $pwd/muse/6.out -o libbio.use -p bio puti.use bio.use geti.use iter.use &&\
echo ar vu libbio.a puti.6 bio.6 geti.6 iter.6 && ar vu libbio.a puti.6 bio.6 geti.6 iter.6 &&\
echo cd $pwd/mbld && cd $pwd/mbld &&\
echo $pwd/6/6.out -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config+plan9-x64.myr && $pwd/6/6.out -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config+plan9-x64.myr &&\