shithub: mc

Download patch

ref: d21cc40703f9e3fb86e590fce62ee0847fc6cfd8
parent: e6055b559692427e7fabb514a436da8c9a3c3777
author: Ori Bernstein <[email protected]>
date: Fri Dec 11 17:20:04 EST 2015

Update bootstrap script.

--- a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
@@ -3,15 +3,14 @@
 # to regenerate, run "make bootstrap"
 pwd=`pwd`
 echo 	cd $pwd/lib/sys;	cd $pwd/lib/sys
-echo 	$pwd/6/6m	`$pwd/sysselect.sh syserrno`;	$pwd/6/6m	`$pwd/sysselect.sh syserrno`
+echo 	$pwd/6/6m	syserrno+freebsd.myr ;	$pwd/6/6m	syserrno+freebsd.myr 
 echo 	$pwd/6/6m	systypes.myr ;	$pwd/6/6m	systypes.myr 
-echo 	$pwd/6/6m	`$pwd/sysselect.sh sys`;	$pwd/6/6m	`$pwd/sysselect.sh sys`
-echo 	$pwd/6/6m	`$pwd/sysselect.sh ifreq`;	$pwd/6/6m	`$pwd/sysselect.sh ifreq`
-echo 	as	-g -o util.o `$pwd/sysselect.sh util`;	as	-g -o util.o `$pwd/sysselect.sh util`
-echo 	as	-g -o syscall.o `$pwd/sysselect.sh syscall`;	as	-g -o syscall.o `$pwd/sysselect.sh syscall`
+echo 	$pwd/6/6m	sys+freebsd-x64.myr ;	$pwd/6/6m	sys+freebsd-x64.myr 
+echo 	$pwd/6/6m	ifreq+freebsd.myr ;	$pwd/6/6m	ifreq+freebsd.myr 
+echo 	as	-g -o util.o util+posixy-x64.s ;	as	-g -o util.o util+posixy-x64.s 
+echo 	as	-g -o syscall.o syscall+freebsd-x64.s ;	as	-g -o syscall.o syscall+freebsd-x64.s 
 echo 	$pwd/muse/muse	-o sys sys.use syserrno.use systypes.use ifreq.use ;	$pwd/muse/muse	-o sys sys.use syserrno.use systypes.use ifreq.use 
 echo 	ar	-rcs libsys.a sys.o syscall.o syserrno.o util.o systypes.o ifreq.o ;	ar	-rcs libsys.a sys.o syscall.o syserrno.o util.o systypes.o ifreq.o 
-echo 	cd $pwd;	cd $pwd
 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 
@@ -18,7 +17,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . errno.myr ;	$pwd/6/6m	-I ../sys -I . errno.myr 
 echo 	$pwd/6/6m	-I ../sys -I . option.myr ;	$pwd/6/6m	-I ../sys -I . option.myr 
 echo 	$pwd/6/6m	-I ../sys -I . result.myr ;	$pwd/6/6m	-I ../sys -I . result.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh syswrap`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh syswrap`
+echo 	$pwd/6/6m	-I ../sys -I . syswrap+posixy.myr ;	$pwd/6/6m	-I ../sys -I . syswrap+posixy.myr 
 echo 	$pwd/6/6m	-I ../sys -I . die.myr ;	$pwd/6/6m	-I ../sys -I . die.myr 
 echo 	$pwd/6/6m	-I ../sys -I . sleq.myr ;	$pwd/6/6m	-I ../sys -I . sleq.myr 
 echo 	$pwd/6/6m	-I ../sys -I . hassuffix.myr ;	$pwd/6/6m	-I ../sys -I . hassuffix.myr 
@@ -27,6 +26,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . memops.myr ;	$pwd/6/6m	-I ../sys -I . memops.myr 
 echo 	$pwd/6/6m	-I ../sys -I . alloc.myr ;	$pwd/6/6m	-I ../sys -I . alloc.myr 
 echo 	$pwd/6/6m	-I ../sys -I . chartype.myr ;	$pwd/6/6m	-I ../sys -I . chartype.myr 
+echo 	$pwd/6/6m	-I ../sys -I . utf.myr ;	$pwd/6/6m	-I ../sys -I . utf.myr 
 echo 	$pwd/6/6m	-I ../sys -I . cmp.myr ;	$pwd/6/6m	-I ../sys -I . cmp.myr 
 echo 	$pwd/6/6m	-I ../sys -I . hasprefix.myr ;	$pwd/6/6m	-I ../sys -I . hasprefix.myr 
 echo 	$pwd/6/6m	-I ../sys -I . slcp.myr ;	$pwd/6/6m	-I ../sys -I . slcp.myr 
@@ -33,7 +33,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . sldup.myr ;	$pwd/6/6m	-I ../sys -I . sldup.myr 
 echo 	$pwd/6/6m	-I ../sys -I . slfill.myr ;	$pwd/6/6m	-I ../sys -I . slfill.myr 
 echo 	$pwd/6/6m	-I ../sys -I . slpush.myr ;	$pwd/6/6m	-I ../sys -I . slpush.myr 
-echo 	$pwd/6/6m	-I ../sys -I . utf.myr ;	$pwd/6/6m	-I ../sys -I . utf.myr 
 echo 	$pwd/6/6m	-I ../sys -I . bigint.myr ;	$pwd/6/6m	-I ../sys -I . bigint.myr 
 echo 	$pwd/6/6m	-I ../sys -I . fltbits.myr ;	$pwd/6/6m	-I ../sys -I . fltbits.myr 
 echo 	$pwd/6/6m	-I ../sys -I . strbuf.myr ;	$pwd/6/6m	-I ../sys -I . strbuf.myr 
@@ -44,7 +43,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr ;	$pwd/6/6m	-I ../sys -I . intparse.myr 
 echo 	$pwd/6/6m	-I ../sys -I . strfind.myr ;	$pwd/6/6m	-I ../sys -I . strfind.myr 
 echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr ;	$pwd/6/6m	-I ../sys -I . strsplit.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh syswrap-ss`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh syswrap-ss`
+echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+freebsd.myr ;	$pwd/6/6m	-I ../sys -I . syswrap-ss+freebsd.myr 
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr ;	$pwd/6/6m	-I ../sys -I . varargs.myr 
 echo 	$pwd/6/6m	-I ../sys -I . fmt.myr ;	$pwd/6/6m	-I ../sys -I . fmt.myr 
 echo 	$pwd/6/6m	-I ../sys -I . assert.myr ;	$pwd/6/6m	-I ../sys -I . assert.myr 
@@ -54,9 +53,9 @@
 echo 	$pwd/6/6m	-I ../sys -I . slurp.myr ;	$pwd/6/6m	-I ../sys -I . slurp.myr 
 echo 	$pwd/6/6m	-I ../sys -I . dirname.myr ;	$pwd/6/6m	-I ../sys -I . dirname.myr 
 echo 	$pwd/6/6m	-I ../sys -I . optparse.myr ;	$pwd/6/6m	-I ../sys -I . optparse.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh dir`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh dir`
+echo 	$pwd/6/6m	-I ../sys -I . dir+freebsd.myr ;	$pwd/6/6m	-I ../sys -I . dir+freebsd.myr 
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr ;	$pwd/6/6m	-I ../sys -I . ipparse.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh env`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh env`
+echo 	$pwd/6/6m	-I ../sys -I . env+posixy.myr ;	$pwd/6/6m	-I ../sys -I . env+posixy.myr 
 echo 	$pwd/6/6m	-I ../sys -I . execvp.myr ;	$pwd/6/6m	-I ../sys -I . execvp.myr 
 echo 	$pwd/6/6m	-I ../sys -I . slput.myr ;	$pwd/6/6m	-I ../sys -I . slput.myr 
 echo 	$pwd/6/6m	-I ../sys -I . spork.myr ;	$pwd/6/6m	-I ../sys -I . spork.myr 
@@ -63,7 +62,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . getint.myr ;	$pwd/6/6m	-I ../sys -I . getint.myr 
 echo 	$pwd/6/6m	-I ../sys -I . blat.myr ;	$pwd/6/6m	-I ../sys -I . blat.myr 
 echo 	$pwd/6/6m	-I ../sys -I . clear.myr ;	$pwd/6/6m	-I ../sys -I . clear.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh wait`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh wait`
+echo 	$pwd/6/6m	-I ../sys -I . wait+posixy.myr ;	$pwd/6/6m	-I ../sys -I . wait+posixy.myr 
 echo 	$pwd/6/6m	-I ../sys -I . strjoin.myr ;	$pwd/6/6m	-I ../sys -I . strjoin.myr 
 echo 	$pwd/6/6m	-I ../sys -I . mk.myr ;	$pwd/6/6m	-I ../sys -I . mk.myr 
 echo 	$pwd/6/6m	-I ../sys -I . fndup.myr ;	$pwd/6/6m	-I ../sys -I . fndup.myr 
@@ -71,8 +70,9 @@
 echo 	$pwd/6/6m	-I ../sys -I . mkpath.myr ;	$pwd/6/6m	-I ../sys -I . mkpath.myr 
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr ;	$pwd/6/6m	-I ../sys -I . endian.myr 
 echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr ;	$pwd/6/6m	-I ../sys -I . strstrip.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh resolve`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh resolve`
+echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr ;	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr 
 echo 	$pwd/6/6m	-I ../sys -I . pathjoin.myr ;	$pwd/6/6m	-I ../sys -I . pathjoin.myr 
+echo 	$pwd/6/6m	-I ../sys -I . slpop.myr ;	$pwd/6/6m	-I ../sys -I . slpop.myr 
 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 . try.myr ;	$pwd/6/6m	-I ../sys -I . try.myr 
@@ -80,11 +80,10 @@
 echo 	$pwd/6/6m	-I ../sys -I . search.myr ;	$pwd/6/6m	-I ../sys -I . search.myr 
 echo 	$pwd/6/6m	-I ../sys -I . getcwd.myr ;	$pwd/6/6m	-I ../sys -I . getcwd.myr 
 echo 	$pwd/6/6m	-I ../sys -I . swap.myr ;	$pwd/6/6m	-I ../sys -I . swap.myr 
-echo 	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh dial`;	$pwd/6/6m	-I ../sys -I . `$pwd/sysselect.sh dial`
-echo 	as	-g -o memops-impl.o `$pwd/sysselect.sh memops-impl`;	as	-g -o memops-impl.o `$pwd/sysselect.sh memops-impl`
-echo 	$pwd/muse/muse	-o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use strfind.use utf.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 spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use ;	$pwd/muse/muse	-o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use strfind.use utf.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 spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use 
-echo 	ar	-rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o strfind.o utf.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 spork.o assert.o cmp.o syswrap-ss.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o ;	ar	-rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o strfind.o utf.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 spork.o assert.o cmp.o syswrap-ss.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o 
-echo 	cd $pwd;	cd $pwd
+echo 	$pwd/6/6m	-I ../sys -I . dial+posixy.myr ;	$pwd/6/6m	-I ../sys -I . dial+posixy.myr 
+echo 	as	-g -o memops-impl.o memops-impl+posixy-x64.s ;	as	-g -o memops-impl.o memops-impl+posixy-x64.s 
+echo 	$pwd/muse/muse	-o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use ;	$pwd/muse/muse	-o std fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use strbuf.use clear.use slput.use strsplit.use introspect.use alloc.use optparse.use memops.use fltbits.use sldup.use fltfmt.use extremum.use option.use slcp.use errno.use wait.use putint.use syswrap.use sort.use dir.use blat.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.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 spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use fndup.use dial.use 
+echo 	ar	-rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 spork.o assert.o cmp.o syswrap-ss.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.o ;	ar	-rcs libstd.a fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getcwd.o rand.o slurp.o varargs.o strbuf.o clear.o slput.o strsplit.o introspect.o alloc.o optparse.o memops.o fltbits.o sldup.o fltfmt.o extremum.o option.o slcp.o errno.o wait.o putint.o syswrap.o sort.o dir.o blat.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.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 spork.o assert.o cmp.o syswrap-ss.o chartype.o bigint.o hashfuncs.o slfill.o fndup.o dial.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 
@@ -92,7 +91,6 @@
 echo 	$pwd/6/6m	-I ../std -I ../sys compile.myr ;	$pwd/6/6m	-I ../std -I ../sys compile.myr 
 echo 	$pwd/muse/muse	-o regex interp.use types.use compile.use ranges.use ;	$pwd/muse/muse	-o regex interp.use types.use compile.use ranges.use 
 echo 	ar	-rcs libregex.a interp.o types.o compile.o ranges.o ;	ar	-rcs libregex.a interp.o types.o compile.o ranges.o 
-echo 	cd $pwd;	cd $pwd
 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 
@@ -99,7 +97,6 @@
 echo 	$pwd/6/6m	-I ../sys -I ../std geti.myr ;	$pwd/6/6m	-I ../sys -I ../std geti.myr 
 echo 	$pwd/muse/muse	-o bio puti.use bio.use geti.use ;	$pwd/muse/muse	-o bio puti.use bio.use geti.use 
 echo 	ar	-rcs libbio.a puti.o bio.o geti.o ;	ar	-rcs libbio.a puti.o bio.o geti.o 
-echo 	cd $pwd;	cd $pwd
 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