Skip to content

Commit 5026a2a

Browse files
committed
Do not rebuild mes, just keep using mes-m2.
1 parent 59b5178 commit 5026a2a

File tree

5 files changed

+2
-32
lines changed

5 files changed

+2
-32
lines changed

parts.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ to this part:
209209

210210
1. Compiling an initial mes using ``M2-Planet``. Note that this is
211211
*only* the Mes interpreter, not the libc or anything else.
212-
2. We then use this to recompile the Mes interpreter as well as building
213-
the libc. This second interpreter is faster and less buggy.
212+
2. We then use this to build the libc.
214213

215214
The ``mescc`` component depends on the ``nyacc`` parsing library, version 1.00.2.
216215
We use a modified version, 1.00.2-lb1, which incorporates Timothy Sample's

steps/mes-0.27/mes-0.27.amd64.checksums

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
7594d17004baa35b368411240be675b5c8e59fcd556a0c0d560721fe2091f8be /usr/bin/mes
21
6ec83e7fd106448610ffe348d1847e501656e1c667f4afbc0099eb8a431726b6 /usr/bin/mes-m2
32
20655e4ec935bdb63099eaf48e89b24010413a444cbcdc3f21a1cd12a5c62ddc /usr/bin/mescc.scm
43
c66de1ba72b8019eee113271638e4e30543aa7d34f45c9cc751346dba0d8817c /usr/lib/x86_64-mes/crt1.s

steps/mes-0.27/mes-0.27.x86.checksums

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
8925c10128b3414062f670795c6eece8760a067d821aff95c26ed2b80c2cd8c0 /usr/bin/mes
21
c7fe23d83f630bcc5f613e7d779cffa30b0cf282c1a49049195e5a44de027a78 /usr/bin/mes-m2
32
761fe4fbbee5bfd45506ea8dbd0aeecfe8855159bd794e07fca1988109510170 /usr/bin/mescc.scm
43
234c264965116a24583dd569050adc766d7cc2da83b1db38085210f26031b70c /usr/lib/x86-mes/crt1.s

steps/mes-0.27/pass1.kaem

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -213,33 +213,7 @@ mescc lib/linux/getdents.c
213213
catm ${LIBDIR}/${MES_ARCH}-mes/libc.a __init_io.o eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o isnumber.o abtol.o cast.o eputc.o fdgetc.o fdputc.o fdputs.o fdungetc.o itoa.o ltoa.o ltoab.o mes_open.o ntoab.o oputc.o ultoa.o utoa.o isdigit.o isspace.o isxdigit.o assert_msg.o write.o atoi.o lseek.o __assert_fail.o __buffered_read.o __mes_debug.o execv.o getcwd.o getenv.o isatty.o open.o buffered-read.o setenv.o wait.o closedir.o opendir.o fgetc.o fputc.o fputs.o getc.o getchar.o putc.o putchar.o ungetc.o calloc.o free.o malloc.o realloc.o memchr.o memcmp.o memcpy.o memmove.o memset.o strcmp.o strcpy.o strncmp.o raise.o access.o brk.o chdir.o chmod.o clock_gettime.o dup.o dup2.o execve.o fork.o fsync.o _getcwd.o gettimeofday.o ioctl3.o _open3.o _read.o readdir.o rename.o time.o umask.o uname.o unlink.o utimensat.o wait4.o waitpid.o syscall.o getpid.o kill.o pipe.o stat.o lstat.o mkdir.o rmdir.o link.o symlink.o close.o nanosleep.o fcntl.o fstat.o getdents.o
214214
catm ${LIBDIR}/${MES_ARCH}-mes/libc.s __init_io.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s isnumber.s abtol.s cast.s eputc.s fdgetc.s fdputc.s fdputs.s fdungetc.s itoa.s ltoa.s ltoab.s mes_open.s ntoab.s oputc.s ultoa.s utoa.s isdigit.s isspace.s isxdigit.s assert_msg.s write.s atoi.s lseek.s __assert_fail.s __buffered_read.s __mes_debug.s execv.s getcwd.s getenv.s isatty.s open.s buffered-read.s setenv.s wait.s closedir.s opendir.s fgetc.s fputc.s fputs.s getc.s getchar.s putc.s putchar.s ungetc.s calloc.s free.s malloc.s realloc.s memchr.s memcmp.s memcpy.s memmove.s memset.s strcmp.s strcpy.s strncmp.s raise.s access.s brk.s chdir.s chmod.s clock_gettime.s dup.s dup2.s execve.s fork.s fsync.s _getcwd.s gettimeofday.s ioctl3.s _open3.s _read.s readdir.s rename.s time.s umask.s uname.s unlink.s utimensat.s wait4.s waitpid.s syscall.s getpid.s kill.s pipe.s stat.s lstat.s mkdir.s rmdir.s link.s symlink.s close.s nanosleep.s fcntl.s fstat.s getdents.s
215215

216-
# Build mes itself
217-
mescc src/builtins.c
218-
mescc src/cc.c
219-
mescc src/core.c
220-
mescc src/display.c
221-
mescc src/eval-apply.c
222-
mescc src/gc.c
223-
mescc src/globals.c
224-
mescc src/hash.c
225-
mescc src/lib.c
226-
mescc src/math.c
227-
mescc src/mes.c
228-
mescc src/module.c
229-
mescc src/posix.c
230-
mescc src/reader.c
231-
mescc src/stack.c
232-
mescc src/string.c
233-
mescc src/struct.c
234-
mescc src/symbol.c
235-
mescc src/variable.c
236-
mescc src/vector.c
237-
238-
# Link everything into new mes executable
239-
${MES} -e main ${mescc_scm} -- --base-address 0x08048000 -L ${LIBDIR} -o ${BINDIR}/mes builtins.o cc.o core.o display.o eval-apply.o gc.o globals.o hash.o lib.o math.o mes.o module.o posix.o reader.o stack.o string.o struct.o symbol.o variable.o vector.o -lc -lmescc
240-
241216
# libc+tcc.a
242-
alias mescc="${BINDIR}/mes -e main ${BINDIR}/mescc.scm -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -c"
243217
mescc lib/ctype/islower.c
244218
mescc lib/ctype/isupper.c
245219
mescc lib/ctype/tolower.c
@@ -391,7 +365,6 @@ cd ../..
391365
# Checksums
392366
if match x${UPDATE_CHECKSUMS} xTrue; then
393367
sha256sum -o ${pkg}.${ARCH}.checksums \
394-
/usr/bin/mes \
395368
/usr/bin/mes-m2 \
396369
/usr/bin/mescc.scm \
397370
/usr/lib/${MES_ARCH}-mes/crt1.s \

steps/tcc-0.9.26/pass1.kaem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MES_ARENA=30000000
1212
MES_MAX_ARENA=30000000
1313
MES_LIB=${MES_PREFIX}/lib
1414
MES_SOURCE=${MES_PREFIX}
15-
MES=${BINDIR}/mes
15+
MES=${BINDIR}/mes-m2
1616

1717
TCC_TAR=tcc-0.9.26
1818
TCC_PKG=tcc-0.9.26-1147-gee75a10c

0 commit comments

Comments
 (0)