summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2017-06-22 21:32:24 -0400
committerOri Bernstein <ori@eigenstate.org>2017-06-22 21:33:58 -0400
commit87a293a736f0f9535ccc299dd7294552efd77743 (patch)
tree909b5e888abb525cfcc43580b285f41abd6e05bd /mk
parent22de060b9329766e623587dc22594c4c54979db3 (diff)
downloadmc-87a293a736f0f9535ccc299dd7294552efd77743.tar.gz
Regenerate bootstrap programs.
Diffstat (limited to 'mk')
-rwxr-xr-xmk/bootstrap/bootstrap+Linux-x86_64.sh15
-rwxr-xr-xmk/bootstrap/bootstrap+OpenBSD-amd64.sh10
2 files changed, 13 insertions, 12 deletions
diff --git a/mk/bootstrap/bootstrap+Linux-x86_64.sh b/mk/bootstrap/bootstrap+Linux-x86_64.sh
index 7d1b12c..67d595b 100755
--- a/mk/bootstrap/bootstrap+Linux-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Linux-x86_64.sh
@@ -7,11 +7,10 @@ echo as -g -o util.o util+posixy-x64.s && as -g -o util.o util+posixy-x64.s
echo $pwd/6/6m syserrno+linux.myr && $pwd/6/6m syserrno+linux.myr &&\
echo $pwd/6/6m systypes.myr && $pwd/6/6m systypes.myr &&\
echo $pwd/6/6m sys+linux-x64.myr && $pwd/6/6m sys+linux-x64.myr &&\
-echo $pwd/6/6m setup+posixy.myr && $pwd/6/6m setup+posixy.myr &&\
echo as -g -o syscall.o syscall+linux-x64.s && as -g -o syscall.o syscall+linux-x64.s &&\
echo $pwd/6/6m ifreq+linux.myr && $pwd/6/6m ifreq+linux.myr &&\
-echo $pwd/muse/muse -o libsys.use -p sys ifreq.use setup.use syserrno.use systypes.use sys.use && $pwd/muse/muse -o libsys.use -p sys ifreq.use setup.use syserrno.use systypes.use sys.use &&\
-echo ar -rcs libsys.a ifreq.o util.o setup.o syserrno.o syscall.o systypes.o sys.o && ar -rcs libsys.a ifreq.o util.o setup.o syserrno.o syscall.o systypes.o sys.o &&\
+echo $pwd/muse/muse -o libsys.use -p sys ifreq.use syserrno.use systypes.use sys.use && $pwd/muse/muse -o libsys.use -p sys ifreq.use syserrno.use systypes.use sys.use &&\
+echo ar -rcs libsys.a ifreq.o util.o syserrno.o syscall.o systypes.o sys.o && ar -rcs libsys.a ifreq.o util.o syserrno.o syscall.o systypes.o sys.o &&\
echo cd $pwd/lib/std && cd $pwd/lib/std &&\
echo $pwd/6/6m -I ../sys -I . types.myr && $pwd/6/6m -I ../sys -I . types.myr &&\
echo $pwd/6/6m -I ../sys -I . cstrconv.myr && $pwd/6/6m -I ../sys -I . cstrconv.myr &&\
@@ -93,6 +92,7 @@ echo $pwd/6/6m -I ../sys -I . slpop.myr && $pwd/6/6m -I ../sys -I . slpop.myr
echo as -g -o sjlj-impl.o sjlj-impl+posixy-x64.s && as -g -o sjlj-impl.o sjlj-impl+posixy-x64.s &&\
echo $pwd/6/6m -I ../sys -I . bitset.myr && $pwd/6/6m -I ../sys -I . bitset.myr &&\
echo $pwd/6/6m -I ../sys -I . fmtfuncs.myr && $pwd/6/6m -I ../sys -I . fmtfuncs.myr &&\
+echo $pwd/6/6m -I ../sys -I . netaddr.myr && $pwd/6/6m -I ../sys -I . netaddr.myr &&\
echo $pwd/6/6m -I ../sys -I . sleep.myr && $pwd/6/6m -I ../sys -I . sleep.myr &&\
echo $pwd/6/6m -I ../sys -I . try.myr && $pwd/6/6m -I ../sys -I . try.myr &&\
echo $pwd/6/6m -I ../sys -I . sort.myr && $pwd/6/6m -I ../sys -I . sort.myr &&\
@@ -101,8 +101,8 @@ echo $pwd/6/6m -I ../sys -I . getcwd.myr && $pwd/6/6m -I ../sys -I . getcwd.m
echo $pwd/6/6m -I ../sys -I . swap.myr && $pwd/6/6m -I ../sys -I . swap.myr &&\
echo $pwd/6/6m -I ../sys -I . sjlj.myr && $pwd/6/6m -I ../sys -I . sjlj.myr &&\
echo $pwd/6/6m -I ../sys -I . dial+posixy.myr && $pwd/6/6m -I ../sys -I . dial+posixy.myr &&\
-echo $pwd/muse/muse -o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use && $pwd/muse/muse -o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use &&\
-echo ar -rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o dir.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o && ar -rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o dir.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o &&\
+echo $pwd/muse/muse -o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use netaddr.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use && $pwd/muse/muse -o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use dir.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use netaddr.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use &&\
+echo ar -rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o dir.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o netaddr.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o && ar -rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o dir.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o netaddr.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o &&\
echo cd $pwd/lib/regex && cd $pwd/lib/regex &&\
echo $pwd/6/6m -I ../std -I ../sys types.myr && $pwd/6/6m -I ../std -I ../sys types.myr &&\
echo $pwd/6/6m -I ../std -I ../sys interp.myr && $pwd/6/6m -I ../std -I ../sys interp.myr &&\
@@ -114,9 +114,10 @@ echo cd $pwd/lib/bio && cd $pwd/lib/bio &&\
echo $pwd/6/6m -I ../sys -I ../std bio.myr && $pwd/6/6m -I ../sys -I ../std bio.myr &&\
echo $pwd/6/6m -I ../sys -I ../std puti.myr && $pwd/6/6m -I ../sys -I ../std puti.myr &&\
echo $pwd/6/6m -I ../sys -I ../std iter.myr && $pwd/6/6m -I ../sys -I ../std iter.myr &&\
+echo $pwd/6/6m -I ../sys -I ../std mem.myr && $pwd/6/6m -I ../sys -I ../std mem.myr &&\
echo $pwd/6/6m -I ../sys -I ../std geti.myr && $pwd/6/6m -I ../sys -I ../std geti.myr &&\
-echo $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use && $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use &&\
-echo ar -rcs libbio.a puti.o bio.o geti.o iter.o && ar -rcs libbio.a puti.o bio.o geti.o iter.o &&\
+echo $pwd/muse/muse -o libbio.use -p bio puti.use bio.use mem.use geti.use iter.use && $pwd/muse/muse -o libbio.use -p bio puti.use bio.use mem.use geti.use iter.use &&\
+echo ar -rcs libbio.a puti.o bio.o mem.o geti.o iter.o && ar -rcs libbio.a puti.o bio.o mem.o geti.o iter.o &&\
echo cd $pwd/mbld && cd $pwd/mbld &&\
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr && $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr &&\
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr && $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr &&\
diff --git a/mk/bootstrap/bootstrap+OpenBSD-amd64.sh b/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
index 3477568..2a428bb 100755
--- a/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
@@ -7,11 +7,10 @@ echo as -g -o util.o util+posixy-x64.s && as -g -o util.o util+posixy-x64.s
echo $pwd/6/6m syserrno+openbsd.myr && $pwd/6/6m syserrno+openbsd.myr &&\
echo $pwd/6/6m systypes.myr && $pwd/6/6m systypes.myr &&\
echo $pwd/6/6m sys+openbsd-x64.myr && $pwd/6/6m sys+openbsd-x64.myr &&\
-echo $pwd/6/6m setup+posixy.myr && $pwd/6/6m setup+posixy.myr &&\
echo as -g -o syscall.o syscall+openbsd-x64.s && as -g -o syscall.o syscall+openbsd-x64.s &&\
echo $pwd/6/6m ifreq+openbsd.myr && $pwd/6/6m ifreq+openbsd.myr &&\
-echo $pwd/muse/muse -o libsys.use -p sys setup.use ifreq.use systypes.use syserrno.use sys.use && $pwd/muse/muse -o libsys.use -p sys setup.use ifreq.use systypes.use syserrno.use sys.use &&\
-echo ar -rcs libsys.a util.o setup.o syscall.o ifreq.o systypes.o syserrno.o sys.o && ar -rcs libsys.a util.o setup.o syscall.o ifreq.o systypes.o syserrno.o sys.o &&\
+echo $pwd/muse/muse -o libsys.use -p sys ifreq.use systypes.use syserrno.use sys.use && $pwd/muse/muse -o libsys.use -p sys ifreq.use systypes.use syserrno.use sys.use &&\
+echo ar -rcs libsys.a util.o syscall.o ifreq.o systypes.o syserrno.o sys.o && ar -rcs libsys.a util.o syscall.o ifreq.o systypes.o syserrno.o sys.o &&\
echo cd $pwd/lib/std && cd $pwd/lib/std &&\
echo $pwd/6/6m -I ../sys -I . types.myr && $pwd/6/6m -I ../sys -I . types.myr &&\
echo $pwd/6/6m -I ../sys -I . cstrconv.myr && $pwd/6/6m -I ../sys -I . cstrconv.myr &&\
@@ -115,9 +114,10 @@ echo cd $pwd/lib/bio && cd $pwd/lib/bio &&\
echo $pwd/6/6m -I ../sys -I ../std bio.myr && $pwd/6/6m -I ../sys -I ../std bio.myr &&\
echo $pwd/6/6m -I ../sys -I ../std puti.myr && $pwd/6/6m -I ../sys -I ../std puti.myr &&\
echo $pwd/6/6m -I ../sys -I ../std iter.myr && $pwd/6/6m -I ../sys -I ../std iter.myr &&\
+echo $pwd/6/6m -I ../sys -I ../std mem.myr && $pwd/6/6m -I ../sys -I ../std mem.myr &&\
echo $pwd/6/6m -I ../sys -I ../std geti.myr && $pwd/6/6m -I ../sys -I ../std geti.myr &&\
-echo $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use && $pwd/muse/muse -o libbio.use -p bio puti.use bio.use geti.use iter.use &&\
-echo ar -rcs libbio.a puti.o bio.o geti.o iter.o && ar -rcs libbio.a puti.o bio.o geti.o iter.o &&\
+echo $pwd/muse/muse -o libbio.use -p bio puti.use bio.use mem.use geti.use iter.use && $pwd/muse/muse -o libbio.use -p bio puti.use bio.use mem.use geti.use iter.use &&\
+echo ar -rcs libbio.a puti.o bio.o mem.o geti.o iter.o && ar -rcs libbio.a puti.o bio.o mem.o geti.o iter.o &&\
echo cd $pwd/mbld && cd $pwd/mbld &&\
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr && $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys config.myr &&\
echo $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr && $pwd/6/6m -I ../lib/regex -I ../lib/bio -I ../lib/std -I ../lib/sys opts.myr &&\