DRAFT lib: stat: Use SYS_stat64 for 32bit platforms.

* include/linux/arm/syscall.h (SYS_stat64, SYS_lstat64, SYS_fstat64)[__SIZEOF_LONG_LONG__ == 8]: New defines. (SYS_stat, SYS_lstat, SYS_fstat)[__SIZEOF_LONG_LONG__ == 8]: Redefine them. * include/linux/x86/syscall.h (SYS_stat64, SYS_lstat64, SYS_fstat64)[__SIZEOF_LONG_LONG__ == 8]: New defines. (SYS_stat, SYS_lstat, SYS_fstat)[__SIZEOF_LONG_LONG__ == 8]: Redefine them. * include/sys/stat.h (struct stat): Move definition to... * include/linux/arm/kernel-stat.h, include/linux/m2/kernel-stat.h, include/linux/x86/kernel-stat.h, include/linux/x86_64/kernel-stat.h: These new files. * include/gnu/x86/kernel-stat.h: New file. * configure (main): Copy <srcdest>include/<kernel>/<arch>/*.h to include/. * configure.sh: Likewise. * .gitignore: Ignore them. Add copyright header. * build-aux/GNUmakefile.in (X86_ARCH_HEADERS, ARCH_HEADERS): New variables. (build): Use them. (include/arch/%.h, arch-dir): New targets. * build-aux/bootstrap.sh.in (AM_CPPFLAGS): Replace <srcdest>include/<kernel>/<cpu> with built ../include. * build-aux/build.sh.in (AM_CPPFLAGS): Likewise. * build-aux/install.sh.in: Also install built include.
DRAFT lib/m2: time: Fix segfault by allocating timeval struct.
2023-02-12 19:27:10 +01:00 · 2023-01-24 08:14:38 +01:00 · 2023-01-08 10:18:46 +01:00 · 2023-01-08 10:18:45 +01:00 · 2023-01-08 10:18:44 +01:00 · 2022-05-07 10:50:06 +02:00
82 changed files with 436 additions and 895 deletions
--- a/18
+++ b/18
@ -2,7 +2,7 @@
 #+TITLE: GNU Mes NEWS – history of user-visible changes
 #+STARTUP: content hidestars

-Copyright © 2016,2017,2018,2019,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@ -10,22 +10,6 @@ Copyright © 2016,2017,2018,2019,2021,2022,2023 Jan (janneke) Nieuwenhuizen <jan

 Please send Mes bug reports to bug-mes@gnu.org.

-* Changes in 0.24.2 since 0.24.1
-** Build
-*** A number of compile warnings have been fixed.
-*** The `simple.make' and `simple.sh' builds have been resurrected.
-** MesCC
-*** Some assembly defines were added for building TinyCC for x86_64.
-*** `__assert_fail' has been updated to use the standard signature.
-** Noteworthy bug fixes
-*** A bootstrap build without M2-Planet is now supported again.
-*** `gettimeofday' no longer segfaults in the M2-Planet build.
-*** `stat64' and friends are now used on 32bit platforms.
-This fixes https://debbugs.gnu.org/41264, and should also fix
-https://debbugs.gnu.org/49985,
-https://debbugs.gnu.org/53415,
-https://debbugs.gnu.org/53416.
-*** The Mes C Library now supports uppercase hex conversions.
 * Changes in 0.24.1 since 0.24
 ** Build
 *** Support M2-Planet bootstrap for ARM.
--- a/5
+++ b/5
@ -1,7 +1,7 @@
                                                              -*- org -*-
 #+TITLE: Tentative GNU Mes Road Map

-Copyright © 2016,2017,2018,2019,2020,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>

  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@ -23,9 +23,6 @@ on Libera Chat!

 * TODO
 ** release 0.x, unsorted
-  - Full Guile module support.
-  - Run Gash and Gash-Utils on Mes.
-  - Remove Guile as a dependency for the Guix Full Source Bootstrap.
  - Integrate Full Source bootstrap for ARM on GNU Guix;
    see branch wip-aarch64-bootstrap.
  - Integrate Reduced Binary Seed bootstrap for ARM on GNU Guix;
--- a/build-aux/GNUmakefile.in
+++ b/build-aux/GNUmakefile.in
@ -1,5 +1,5 @@
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018,2019,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -357,7 +357,6 @@ tag:
 #  1. Tag for release
 #     make tag VERSION=0.23
 #  2. Create signed tarball
-#     ./configure
 #     make sign-dist
 #  3. Update Guix package description
 #     make release
--- a/build-aux/bootstrap.sh.in
+++ b/build-aux/bootstrap.sh.in
@ -1,7 +1,7 @@
 #! @SHELL@

 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -54,16 +54,18 @@ AM_CPPFLAGS="-D HAVE_CONFIG_H=1 -I ${srcdest}include -I ../include -I include"
 AM_CFLAGS="-L ${srcdest}lib"

 mkdir -p $mes_cpu-mes
-$CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c
+cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c .
+$CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS crt1.c
 cp crt1.o $mes_cpu-mes
 cp crt1.s $mes_cpu-mes

 objects=
 for c in $libc_mini_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
    if test ! -e $o -o ${srcdest}$c -nt $o; then
        echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
    fi
    objects="$objects $o"
 done
@ -72,10 +74,11 @@ $AR crD $mes_cpu-mes/libc-mini.a $objects

 objects=
 for c in $libmescc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
    if test ! -e $o -o ${srcdest}$c -nt $o; then
        echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
    fi
    objects="$objects $o"
 done
@ -84,10 +87,11 @@ $AR crD $mes_cpu-mes/libmescc.a $objects

 objects=
 for c in $libc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
    if test ! -e $o -o ${srcdest}$c -nt $o; then
        echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
    fi
    objects="$objects $o"
 done
@ -96,10 +100,11 @@ $AR crD $mes_cpu-mes/libc.a $objects

 objects=
 for c in $libc_tcc_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
    if test ! -e $o -o ${srcdest}$c -nt $o; then
        echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
    fi
    objects="$objects $o"
 done
@ -113,10 +118,11 @@ AM_CFLAGS="-L ${srcdest}lib"

 objects=
 for c in $mes_SOURCES; do
-    o=$(basename $c .c).o
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
+    o=$b.o
    if test ! -e $o -o ${srcdest}$c -nt $o; then
        echo "  CC       $c"
-        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS ${srcdest}$c
+        $CC -c $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS -o $o ${srcdest}$c
    fi
    objects="$objects $o"
 done
--- a/build-aux/build-lib.sh
+++ b/build-aux/build-lib.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -26,7 +26,8 @@
 trap 'test -f .log && cat .log' EXIT

 mkdir -p $mes_cpu-mes
-compile lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c
+cp ${srcdest}lib/$mes_kernel/$mes_cpu-mes-$compiler/crt1.c .
+compile crt1.c
 cp crt1.o $mes_cpu-mes
 if test -e crt1.s; then
    cp crt1.s $mes_cpu-mes
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@ -150,7 +150,6 @@ fi
    ${SHELL} ${srcdest}build-aux/build-lib.sh
    ${SHELL} ${srcdest}build-aux/build-source-lib.sh
    if $bootstrap; then
-        rm -f globals.* # FIXME: avoid name clash with globals from lib
        ${SHELL} ${srcdest}build-aux/build-mes.sh
        cp -f bin/mes-mescc ../bin
        cp -f bin/mes ../bin
--- a/build-aux/cc.sh
+++ b/build-aux/cc.sh
@ -1,5 +1,5 @@
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -18,8 +18,12 @@

 objects=
 compile () {
-    c=${srcdest}$1
-    b=$(basename $c .c)
+    if test $(dirname $1) = "."; then
+        c=$1
+    else
+        c=${srcdest}$1
+    fi
+    b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
    o=$b.o
    objects="$objects $o"
    if test ! -e $o -o $c -nt $o; then
@ -34,7 +38,7 @@ archive () {
    sources="$@"
    objects=
    for c in $sources; do
-        b=$(basename $c .c)
+        b=$(echo $c | sed -re s,^[.]+/,, -e s,/,-,g -e s,[.]c$,,)
        o=$b.o
        compile $c
    done
--- a/build-aux/configure-lib.sh
+++ b/build-aux/configure-lib.sh
@ -74,7 +74,7 @@ libc_mini_SOURCES="$libc_mini_shared_SOURCES"

 if test $mes_libc = mes; then
    libc_mini_SOURCES="$libc_mini_SOURCES
-lib/mes/mini-write.c
+lib/mes/write.c
 "
 fi

@ -215,6 +215,7 @@ lib/linux/malloc.c
 lib/linux/_read.c
 lib/linux/time.c
 lib/linux/unlink.c
+lib/linux/wait4.c
 lib/linux/waitpid.c
 lib/linux/$mes_cpu-mes-$compiler/syscall.c
 lib/linux/getpid.c
--- a/build-aux/pointer.sh
+++ b/build-aux/pointer.sh
@ -48,7 +48,6 @@ sed -ri                                                         \
    include/mes/mes.h                                           \
    include/mes/symbols.h                                       \
    include/mes/builtins.h                                      \
-    include/m2/lib.h                                            \
    src/builtins.c                                              \
    src/cc.c                                                    \
    src/core.c                                                  \
--- a/4
+++ b/4
@ -4,7 +4,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
 !#

 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018,2019,2020,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Vagrant Cascadian <vagrant@reproducible-builds.org>
 ;;;
 ;;; configure: This file is part of GNU Mes.
@ -37,7 +37,7 @@ MES_ARENA=100000000 exec ${SCHEME-guile} -L . --no-auto-compile -e '(configure)'
 (define PACKAGE "mes")
 (define PACKAGE-NAME "GNU Mes")
 (define PACKAGE-BUGREPORT "bug-mes@gnu.org")
-(define VERSION "0.24.2")
+(define VERSION "0.24.1")

 (cond-expand
 (guile)
--- a/configure.sh
+++ b/configure.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018,2019,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -20,7 +20,7 @@

 set -e

-VERSION=0.24.2
+VERSION=0.24.1
 srcdir=${srcdir-$(dirname $0)}
 srcdest=
 if test "$srcdir" != "."; then
--- a/doc/announce/ANNOUNCE-0.24.2
+++ b/doc/announce/ANNOUNCE-0.24.2
@ -1,117 +0,0 @@
-
-Subject: GNU Mes 0.24.2 released
-
-<#secure method=pgpmime mode=sign>
-
-We are happy to announce the release of GNU Mes 0.24.2, representing 25
-commits over nine months by four people.
-
-This release should fix the long standing `stat64' bug #41264[0].
-
-We are very grateful that the NLnet Foundation[1] is sponsoring this
-work!
-
-What's next?
-
-Work to prototype this so-called "Full Source Bootstrap" for ARM on
-Aarch64 is happening on the wip-aarch64-bootstrap[2] branch.  Also, full
-Guile compatible module support, and RISC-V support.
-
-Enjoy!
-
-* About
-
-  GNU Mes[3] is a Scheme interpreter and C compiler for bootstrapping
-  the GNU System.  Since version 0.22 it has again helped to halve the
-  size of opaque, uninspectable binary seeds that are currently being
-  used in the Reduced Binary Seed bootstrap[4] of GNU Guix[5].  The
-  final goal is to help create a full source bootstrap as part of the
-  bootstrappable builds[6] effort for UNIX-like operating systems.
-
-  The Scheme interpreter is written in ~5,000 LOC of simple C, and the C
-  compiler written in Scheme and these are mutual self-hosting.  Mes can
-  now be bootstrapped from M2-Planet[7] and Mescc-Tools[8].
-
-  Mes has a Garbage Collector, a library of loadable Scheme modules--
-  notably Dominique Boucher's LALR[9], Pre-R6RS portable
-  syntax-case[10] with R7RS ellipsis, Matt Wette's Nyacc[11] --and test
-  suite, just enough to support a REPL and a C99 compiler: mescc.
-
-  Mes + MesCC + Mes C Library can build a bootstrappable TinyCC[12] that
-  is self-hosting.  Using this tcc and the Mes C library we now have a
-  Reduced Binary Seed bootstrap for the gnutools triplet: glibc-2.2.5,
-  binutils-2.20.1, gcc-2.95.3.  This is enough to bootstrap Guix for
-  i686-linux, x86_64-linux, armhf-linux and aarch64-linux.
-
-  Mes is inspired by The Maxwell Equations of Software: LISP-1.5[13] --
-  John McCarthy page 13, GNU Guix's source/binary packaging transparency
-  and Jeremiah Orians's stage0[14] 357-byte self-hosting hex assembler.
-
-* Download
-
-  git clone git://git.savannah.gnu.org/mes.git
-
-  Here are the compressed sources and a GPG detached signature[*]:
-    https://ftp.gnu.org/gnu/mes/mes-0.24.2.tar.gz
-    https://ftp.gnu.org/gnu/mes/mes-0.24.2.tar.gz.sig
-
-  Use a mirror for higher download bandwidth:
-    https://ftpmirror.gnu.org/mes/mes-0.24.2.tar.gz
-    https://ftpmirror.gnu.org/mes/mes-0.24.2.tar.gz.sig
-
-  Here are the SHA1 and SHA256 checksums:
-
-  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  mes-0.24.2.tar.gz
-  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx  mes-0.24.2.tar.gz
-
-  [*] Use a .sig file to verify that the corresponding file (without the
-  .sig suffix) is intact.  First, be sure to download both the .sig file
-  and the corresponding tarball.  Then, run a command like this:
-
-    gpg --verify mes-0.24.2.tar.gz.sig
-
-  If that command fails because you don't have the required public key,
-  or that public key has expired, try the following commands to update
-  or refresh it, and then rerun the 'gpg --verify' command.
-
-    gpg --recv-keys 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273
-
-* Get informed, get involved
-
-  See https://bootstrappable.org
-  Join #bootstrappable on irc.libera.chat
-
-* NEWS
- * Changes in 0.24.2 since 0.24.1
- ** Build
- *** A number of compile warnings have been fixed.
- *** The `simple.make' and `simple.sh' builds have been resurrected.
- ** MesCC
- *** Some assembly defines were added for building TinyCC for x86_64.
- *** `__assert_fail' has been updated to use the standard signature.
- ** Noteworthy bug fixes
- *** A bootstrap build without M2-Planet is now supported again.
- *** `gettimeofday' no longer segfaults in the M2-Planet build.
- *** `stat64' and friends are now used on 32bit platforms.
- This fixes https://debbugs.gnu.org/41264, and should also fix
- https://debbugs.gnu.org/49985,
- https://debbugs.gnu.org/53415,
- https://debbugs.gnu.org/53416.
- *** The Mes C Library now supports uppercase hex conversions.
-
-* Links
-  [0] https://debbugs.gnu.org/41264
-  [1] https://nlnet.nl/project/GNUMes-ARM_RISC-V
-  [2] https://git.savannah.gnu.org/cgit/guix.git/log/?h=wip-aarch64-bootstrap
-  [3] https://www.gnu.org/software/mes
-  [4] https://guix.gnu.org/blog/2020/guix-further-reduces-bootstrap-seed-to-25
-  [5] https://www.gnu.org/software/guix
-  [6] https://bootstrappable.org
-  [7] https://github.com/oriansj/m2-planet
-  [8] https://savannah.nongnu.org/projects/mescc-tools
-  [9] https://github.com/schemeway/lalr-scm
-  [10] https://www.cs.indiana.edu/chezscheme/syntax-case/old-psyntax.html
-  [11] https://www.nongnu.org/nyacc
-  [12] https://gitlab.com/janneke/tinycc
-  [13] http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf
-  [14] https://github.com/oriansj/stage0-posix
--- a/guix/git/mes.scm
+++ b/guix/git/mes.scm
@ -87,7 +87,7 @@ get_machine.")
 (define-public m2-planet
  (package
    (name "m2-planet")
-    (version "1.9.0")
+    (version "1.10.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@ -97,7 +97,7 @@ get_machine.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0cgvvq91cbxxm93k8ayyvhpaf3c2lv10qw4wyqwn3hc1qb1cfyvr"))))
+                "03ixvfdzhyy1d94iqpwl0p924pdvdp7yq4ggm05w3c013kzy2y12"))))
    (native-inputs (list mescc-tools))
    (build-system gnu-build-system)
    (arguments
@ -183,13 +183,13 @@ extensive examples, including parsers for the Javascript and C99 languages.")
 (define-public mes
  (package
    (name "mes")
-    (version #!mes!# "0.24.2")
+    (version #!mes!# "0.24.1")
    (source (origin
              (method url-fetch)
              (uri (string-append
                    "https://ftp.gnu.org/pub/gnu/mes/mes-" version ".tar.gz"))
              (sha256
-               (base32 #!mes!# "0vp8v88zszh1imm3dvdfi3m8cywshdj7xcrsq4cgmss69s2y1nkx"))))
+               (base32 #!mes!# "0246sy5zm49zw4zs87hrq1j1x74mchijh4rlj2mzlwjccha5cybs"))))
    (build-system gnu-build-system)
    (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux"))
    (propagated-inputs (list mescc-tools nyacc))
@ -238,7 +238,7 @@ Guile.")
    (license gpl3+)))

 (define-public mes.git
- (let ((version #!mes!# "0.24.2")
+ (let ((version #!mes!# "0.24.1")
        (revision "0")
        (commit (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ))))
    (package
--- a/include/assert.h
+++ b/include/assert.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -27,9 +27,8 @@
 #undef __MES_ASSERT_H
 #include_next <assert.h>
 #else // ! SYSTEM_LIBC
-#define assert(x) ((x) ? (void)0 : __assert_fail (#x, 0, 0, 0))
-void __assert_fail (char const *s, char const *file, unsigned line,
-                    char const *function);
+#define assert(x) ((x) ? (void)0 : __assert_fail (#x))
+void __assert_fail (char *s);
 #endif // ! SYSTEM_LIBC

 #endif // __MES_ASSERT_H
--- a/include/fcntl.h
+++ b/include/fcntl.h
@ -69,8 +69,11 @@
 #define creat(file_name, mode) open (file_name, O_WRONLY | O_CREAT | O_TRUNC, mode)
 int dup (int old);
 int dup2 (int old, int new);
+
+#if !__M2__
 int fcntl (int filedes, int command, ...);
 int open (char const *s, int flags, ...);
+#endif

 #endif // ! SYSTEM_LIBC

--- a/include/linux/arm/syscall.h
+++ b/include/linux/arm/syscall.h
@ -25,47 +25,29 @@

 /* libc-mini */
 #ifndef SYS_exit
-// CONSTANT SYS_exit 0x01
 #define SYS_exit    0x01
 #endif
 #ifndef SYS_write
-// CONSTANT SYS_write 0x04
 #define SYS_write   0x04
 #endif

 /* libc */
-// CONSTANT SYS_fork 0x02
 #define SYS_fork    0x02
-// CONSTANT SYS_read 0x03
 #define SYS_read    0x03
-// CONSTANT SYS_open 0x05
 #define SYS_open    0x05
 //#define SYS_waitpid
-// CONSTANT SYS_wait4 0x72
 #define SYS_wait4   0x72
-// CONSTANT SYS_execve 0x0b
 #define SYS_execve  0x0b
-// CONSTANT SYS_chmod 0x0f
 #define SYS_chmod   0x0f
-// CONSTANT SYS_access 0x21
 #define SYS_access  0x21
-// CONSTANT SYS_brk 0x2d
 #define SYS_brk     0x2d
-// CONSTANT SYS_ioctl 0x36
 #define SYS_ioctl   0x36
-// CONSTANT SYS_fsync 0x76
 #define SYS_fsync   0x76
-// CONSTANT SYS_getcwd 0xb7
 #define SYS_getcwd  0xb7
-// CONSTANT SYS_dup 0x29
 #define SYS_dup     0x29
-// CONSTANT SYS_dup2 0x3f
 #define SYS_dup2    0x3f
-// CONSTANT SYS_unlink 0x0a
 #define SYS_unlink  0x0a
-// CONSTANT SYS_gettimeofday 0x4e
 #define SYS_gettimeofday 0x4e
-// CONSTANT SYS_clock_gettime 0x107
 #define SYS_clock_gettime 0x107

 /* libc+tcc */
--- a/include/linux/m2/kernel-stat.h
+++ b/include/linux/m2/kernel-stat.h
@ -20,9 +20,9 @@
 #ifndef __LINUX_M2_KERNEL_STAT_H
 #define __LINUX_M2_KERNEL_STAT_H

-/* https://github.com/torvalds/linux/blob/master/arch/x86/include/uapi/asm/stat.h */
+// https://github.com/torvalds/linux/blob/master/arch/x86/include/uapi/asm/stat.h

-/* *INDENT-OFF* */
+// *INDENT-OFF*
 struct stat
 {
  unsigned st_dev;
@ -44,4 +44,4 @@ struct stat
  unsigned __pad0;
  unsigned __pad1;
 };
-#endif /* __LINUX_M2_KERNEL_STAT_H */
+#endif // __LINUX_M2_KERNEL_STAT_H
--- a/include/linux/x86/syscall.h
+++ b/include/linux/x86/syscall.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -22,50 +22,30 @@

 /* libc-mini */
 #ifndef SYS_exit
-// CONSTANT SYS_exit 0x01
 #define SYS_exit    0x01
 #endif
 #ifndef SYS_write
-// CONSTANT SYS_write 0x04
 #define SYS_write   0x04
 #endif

 /* libc */
-// CONSTANT SYS_fork 0x02
 #define SYS_fork    0x02
-// CONSTANT SYS_read 0x03
 #define SYS_read    0x03
-// CONSTANT SYS_open 0x05
 #define SYS_open    0x05
-// CONSTANT SYS_waitpid 0x07
 #define SYS_waitpid 0x07
-// CONSTANT SYS_wait4 0x72
 #define SYS_wait4   0x72
-// CONSTANT SYS_execve 0x0b
 #define SYS_execve  0x0b
-// CONSTANT SYS_chmod 0x0f
 #define SYS_chmod   0x0f
-// CONSTANT SYS_access 0x21
 #define SYS_access  0x21
-// CONSTANT SYS_brk 0x2d
 #define SYS_brk     0x2d
-// CONSTANT SYS_ioctl 0x36
 #define SYS_ioctl   0x36
-// CONSTANT SYS_fsync 0x76
 #define SYS_fsync   0x76
-// CONSTANT SYS_getcwd 0xb7
 #define SYS_getcwd 0xb7
-// CONSTANT SYS_dup 0x29
 #define SYS_dup       0x29
-// CONSTANT SYS_dup2 0x3f
 #define SYS_dup2      0x3f
-// CONSTANT SYS_unlink 0x0a
 #define SYS_unlink 0x0a
-// CONSTANT SYS_gettimeofday 0x4e
 #define SYS_gettimeofday 0x4e
-// CONSTANT SYS_clock_gettime 0x109
 #define SYS_clock_gettime 0x109
-// CONSTANT SYS_time 0x0d
 #define SYS_time   0x0d

 /* libc+tcc */
--- a/include/m2/lib.h
+++ b/include/m2/lib.h
@ -1,70 +0,0 @@
-/*
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __M2_LIB_H
-#define __M2_LIB_H
-
-char **environ;
-int __stdin;
-int __stdout;
-int __stderr;
-int errno;
-
-// CONSTANT EOF 0xffffffff
-// CONSTANT __FILEDES_MAX 512
-
-char* cast_intp_to_charp (int *i);
-char* cast_long_to_charp (long i);
-long cast_charp_to_long (char const *);
-long cast_int_to_long (int i);
-long cast_voidp_to_long (void const *);
-
-char *itoa (int number);
-char *ltoa (long number);
-int __ungetc_p (int filedes);
-int eputs (char *s);
-int oputs (char *s);
-int puts (char *s);
-size_t strlen (char *s);
-ssize_t _write ();
-ssize_t write (int filedes, void *buffer, size_t size);
-void __ungetc_clear (int filedes);
-void __ungetc_init ();
-void __ungetc_set (int filedes, int c);
-
-struct timezone
-{
-  int tz_minuteswest;
-  int tz_dsttime;
-};
-
-struct timespec
-{
-  long tv_sec;
-  long tv_nsec;
-};
-
-struct timeval
-{
-  long tv_sec;
-  long tv_usec;
-};
-
-#endif /* __M2_LIB_H */
--- a/include/m2/types.h
+++ b/include/m2/types.h
@ -1,138 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __M2_TYPES_H
-#define __M2_TYPES_H 1
-
-/*
-#ifndef __MES_CLOCK_T
-#define __MES_CLOCK_T
-#undef clock_t
-typedef long clock_t;
-#endif
-*/
-
-#ifndef __MES_DEV_T
-#define __MES_DEV_T
-#undef dev_t
-typedef long dev_t;
-#endif
-
-/*
-#if !defined (__MES_FILE_T) && ! defined (_FILE_T)
-#define __MES_FILE_T
-#define _FILE_T
-typedef long FILE;
-#endif
-*/
-
-#ifndef __MES_GID_T
-#define __MES_GID_T
-#undef gid_t
-typedef unsigned gid_t;
-#endif
-
-#ifndef __MES_INO_T
-#define __MES_INO_T
-#undef ino_t
-typedef unsigned ino_t;
-#endif
-
-#if __SIZEOF_LONG_LONG__ == 8
-#ifndef __MES_INO64_T
-#define __MES_INO64_T
-#undef ino64_t
-typedef unsigned ino64_t;
-#endif
-#endif // __SIZEOF_LONG_LONG__ == 8
-
-#if !defined (__MES_INTPTR_T) && !defined (__intptr_t_defined)
-#define __MES_INTPTR_T
-#define __intptr_t_defined
-#undef intptr_t
-typedef long intptr_t;
-#undef uintptr_t
-typedef unsigned uintptr_t;
-#endif
-
-#ifndef __MES_OFF_T
-#define __MES_OFF_T
-#undef off_t
-typedef long off_t;
-#endif
-
-#if __SIZEOF_LONG_LONG__ == 8
-#ifndef __MES_OFF64_T
-#define __MES_OFF64_T
-#undef off64_t
-typedef unsigned off64_t;
-#endif
-#endif // __SIZEOF_LONG_LONG__ == 8
-
-#ifndef __MES_PID_T
-#define __MES_PID_T
-#undef pid_t
-typedef int pid_t;
-#endif
-
-#ifndef __PTRDIFF_T
-#define __PTRDIFF_T
-#ifndef __MES_PTRDIFF_T
-#define __MES_PTRDIFF_T
-#undef ptrdiff_t
-typedef long ptrdiff_t;
-#endif
-#endif
-
-#ifndef __MES_SIGVAL_T
-#define __MES_SIGVAL_T
-#undef clock_t
-typedef long sigval_t;
-#endif
-
-#ifndef __SIZE_T
-#define __SIZE_T
-#ifndef __MES_SIZE_T
-#define __MES_SIZE_T
-typedef unsigned size_t;
-#endif
-#endif
-
-#ifndef __MES_SSIZE_T
-#define __MES_SSIZE_T
-#undef ssize_t
-typedef long ssize_t;
-#endif
-
-#ifndef __MES_UID_T
-#define __MES_UID_T
-#undef uid_t
-typedef unsigned uid_t;
-#endif
-
-#ifndef __WCHAR_T
-#define __WCHAR_T
-#ifndef __MES_WCHAR_T
-#define __MES_WCHAR_T
-#undef wchar_t
-typedef int wchar_t;
-#endif
-#endif
-
-#endif // __M2_TYPES_H
--- a/include/mes/constants.h
+++ b/include/mes/constants.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -23,76 +23,32 @@

 /* Cell types */

-// CONSTANT TCHAR          0
 #define TCHAR              0

-// CONSTANT TBYTES         1
 #define TBYTES             1
-// CONSTANT TCLOSURE       2
 #define TCLOSURE           2
-// CONSTANT TCONTINUATION  3
 #define TCONTINUATION      3
-// CONSTANT TKEYWORD       4
 #define TKEYWORD           4
-// CONSTANT TMACRO         5
 #define TMACRO             5
-// CONSTANT TNUMBER        6
 #define TNUMBER            6
-// CONSTANT TPAIR          7
 #define TPAIR              7
-// CONSTANT TPORT          8
 #define TPORT              8
-// CONSTANT TREF           9
 #define TREF               9
-// CONSTANT TSPECIAL      10
 #define TSPECIAL          10
-// CONSTANT TSTRING       11
 #define TSTRING           11
-// CONSTANT TSTRUCT       12
 #define TSTRUCT           12
-// CONSTANT TSYMBOL       13
 #define TSYMBOL           13
-// CONSTANT TVALUES       14
 #define TVALUES           14
-// CONSTANT TVARIABLE     15
 #define TVARIABLE         15
-// CONSTANT TVECTOR       16
 #define TVECTOR           16
-// CONSTANT TBROKEN_HEART 17
 #define TBROKEN_HEART     17

 /* Struct types */

-// CONSTANT STRUCT_TYPE 0
 #define STRUCT_TYPE 0
-// CONSTANT STRUCT_PRINTER 1
 #define STRUCT_PRINTER 1

-// CONSTANT GC_FRAME_SIZE 5
 #define GC_FRAME_SIZE 5
-// CONSTANT GC_FRAME_PROCEDURE 4
 #define GC_FRAME_PROCEDURE 4

-// CONSTANT STDIN 0
-// CONSTANT STDOUT 1
-// CONSTANT STDERR 2
-
-/* Unknown type 1
-// CONSTANT EOF -1
-*/
-
-// CONSTANT O_RDONLY 0
-// CONSTANT O_WRONLY 1
-// CONSTANT O_CREAT 0x40
-// CONSTANT O_TRUNC 0x200
-
-// CONSTANT PATH_MAX 1024
-// CONSTANT __FILEDES_MAX 512
-
-// CONSTANT S_IRUSR 00400
-// CONSTANT S_IWUSR 00200
-
-// CONSTANT CLOCK_PROCESS_CPUTIME_ID 2
-
-
 #endif /* __MES_CONSTANTS_H */
--- a/include/mes/lib-mini.h
+++ b/include/mes/lib-mini.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -25,21 +25,27 @@
 #include <mes/config.h>
 #endif

-// CONSTANT STDIN 0
 #ifndef STDIN
 #define STDIN 0
 #endif

-// CONSTANT STDOUT 1
 #ifndef STDOUT
 #define STDOUT 1
 #endif

-// CONSTANT STDERR 2
 #ifndef STDERR
 #define STDERR 2
 #endif

+/* M2-Planet does not support pointer arithmetic.  Explicitly compensate
+   for that by multiplying with M2_PTR_SIZE when using (char)
+   pointers. */
+#if __M2__
+#define M2_PTR_SIZE 4
+#else
+#define M2_PTR_SIZE 1
+#endif
+
 extern char **environ;
 extern int __stdin;
 extern int __stdout;
@ -63,10 +69,14 @@ int oputs (char const *s);
 #ifndef __MES_SIZE_T
 #define __MES_SIZE_T
 #undef size_t
+#if __M2__
+typedef unsigned size_t;
+#else
 typedef unsigned long size_t;
 #endif
 #endif
 #endif
+#endif

 #ifndef _SSIZE_T
 #define _SSIZE_T
--- a/include/mes/lib.h
+++ b/include/mes/lib.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -23,6 +23,9 @@

 #include <mes/lib-mini.h>

+#define __FILEDES_MAX 512
+extern char *__brk;
+
 char *cast_intp_to_charp (int const *i);
 char *cast_long_to_charp (long i);
 long cast_charp_to_long (char const *);
@ -34,14 +37,11 @@ void __ungetc_init ();
 void __ungetc_clear (int filedes);
 void __ungetc_set (int filedes, int c);
 int __ungetc_p (int filedes);
-double abtod (char const **p, int base);
 long abtol (char const **p, int base);
-char *dtoab (double number, int base, int signed_p);
 char *itoa (int number);
 char *ltoa (long number);
 char *ltoab (long x, int base);
 char *ntoab (long number, unsigned base, int signed_p);
-char *ultoa (unsigned long number);
 char *utoa (unsigned number);
 int eputc (int c);
 int fdgetc (int fd);
@ -61,30 +61,30 @@ char *search_path (char const *file_name);
 ssize_t _read (int fd, void *buffer, size_t size);
 void assert_msg (int check, char *msg);

-extern char *__brk;
-extern void (*__call_at_exit) (void);
-
-#define __FILEDES_MAX 512
+long __mesabi_imod (long a, long b);
+long __mesabi_idiv (long a, long b);
+void *__memcpy (void *dest, void const *src, size_t n);
+void *__memmove (void *dest, void const *src, size_t n);
+void *__memset (void *s, int c, size_t n);
+int __raise (int signal);

 #if !SYSTEM_LIBC
-void __assert_fail (char const *s, char const *file, unsigned line,
-                    char const *function);
+void __assert_fail (char *s);
 ssize_t __buffered_read (int filedes, void *buffer, size_t size);
 size_t __buffered_read_clear (int filedes);
 void _exit (int code);
 long brk (void *addr);
 #endif // !SYSTEM_LIBC

-long __mesabi_imod (long a, long b);
-long __mesabi_idiv (long a, long b);
+#if !__M2__
+extern void (*__call_at_exit) (void);
+double abtod (char const **p, int base);
+char *dtoab (double number, int base, int signed_p);
+char *ultoa (unsigned long number);
 unsigned long __mesabi_umod (unsigned long a, unsigned long b);
 unsigned long __mesabi_udiv (unsigned long a, unsigned long b);
 unsigned long __mesabi_uldiv (unsigned long a, unsigned long b,
                              unsigned long *remainder);
-
-void *__memcpy (void *dest, void const *src, size_t n);
-void *__memmove (void *dest, void const *src, size_t n);
-void *__memset (void *s, int c, size_t n);
-int __raise (int signal);
+#endif

 #endif //__MES_LIB_H
--- a/include/mes/mes.h
+++ b/include/mes/mes.h
@ -53,6 +53,15 @@ struct scm
  };
 };

+/* M2-Planet does not support pointer arithmetic.  Explicitly compensate
+   for that by multiplying with M2_CELL_SIZE when using cell
+   pointers. */
+#if __M2__
+#define M2_CELL_SIZE 12
+#else
+#define M2_CELL_SIZE 1
+#endif
+
 /* mes */
 extern char *g_datadir;
 extern int g_debug;
--- a/include/mes/symbols.h
+++ b/include/mes/symbols.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -137,14 +137,8 @@ extern struct scm *cell_type_broken_heart;
 extern struct scm *cell_symbol_program;
 extern struct scm *cell_symbol_test;

-// CONSTANT SYMBOL_MAX 114
 #define SYMBOL_MAX 114
-
-// CONSTANT CELL_UNSPECIFIED 7
 #define CELL_UNSPECIFIED 7
-
-// CONSTANT CELL_SYMBOL_RECORD_TYPE 82
 #define CELL_SYMBOL_RECORD_TYPE 82

-
 #endif /* __MES_SYMBOLS_H */
--- a/include/signal.h
+++ b/include/signal.h
@ -29,9 +29,12 @@

 #define _SIGSET_NITEMS (_NSIG / (8 * sizeof(unsigned long)))

-typedef struct {
+#if !__M2__
+typedef struct
+{
  unsigned long items[_SIGSET_NITEMS];
 } sigset_t;
+#endif
 typedef long stack_t;

 #include <sys/types.h>
@ -91,6 +94,7 @@ typedef long stack_t;
 #define SA_NOMASK  SA_NODEFER
 #define SA_ONESHOT SA_RESETHAND

+#if !__M2__ // lacks short, casts
 typedef struct siginfo_t
 {
  int          si_signo;
@ -120,7 +124,7 @@ typedef struct siginfo_t
 } siginfo_t;
 // *INDENT-ON*

-#if __MESC__
+#if __M2__ || __MESC__
 typedef long sighandler_t;
 #else
 typedef void (*sighandler_t) (int);
@ -255,6 +259,7 @@ int sigemptyset (sigset_t * set);
 #endif
 int sigprocmask (int how, sigset_t const *set, sigset_t * oldset);

+#endif // !__M2__
 #endif //! SYSTEM_LIBC

 #endif // __MES_SIGNAL_H
--- a/include/stdio.h
+++ b/include/stdio.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -65,30 +65,33 @@ int ferror (FILE * stream);
 int fflush (FILE * stream);
 int fgetc (FILE * stream);
 char *fgets (char *s, int size, FILE * stream);
-int fprintf (FILE * stream, char const *format, ...);
 int fpurge (FILE * stream);
 int fputc (int c, FILE * stream);
 int fputs (char const *s, FILE * stream);
-int fscanf (FILE * stream, char const *template, ...);
 int fseek (FILE * stream, long offset, int whence);
 int getc (FILE * stream);
 int getchar (void);
 char *getlogin (void);
-int printf (char const *format, ...);
 int putc (int c, FILE * stream);
 int putchar (int c);
 int puts (char const *s);
 int remove (char const *file_name);
 int setvbuf (FILE * stream, char *buf, int mode, size_t size);
-int snprintf (char *str, size_t size, char const *format, ...);
-int sprintf (char *str, char const *format, ...);
-int sscanf (char const *str, char const *format, ...);
 int ungetc (int c, FILE * stream);
 long ftell (FILE * stream);
 size_t fread (void *ptr, size_t size, size_t count, FILE * stream);
 size_t freadahead (FILE * fp);
 size_t fwrite (void const *ptr, size_t size, size_t count, FILE * stream);

+#if !__M2__
+int fprintf (FILE * stream, char const *format, ...);
+int fscanf (FILE * stream, char const *template, ...);
+int printf (char const *format, ...);
+int snprintf (char *str, size_t size, char const *format, ...);
+int sprintf (char *str, char const *format, ...);
+int sscanf (char const *str, char const *format, ...);
+#endif // !__M2__
+
 #endif // ! SYSTEM_LIBC

 #endif // __MES_STDIO_H
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@ -28,8 +28,13 @@

 #define TCGETS 0x5401
 #define TCGETA 0x5405
+#if __M2__
+int ioctl (int fd, unsigned request, long data);
+int ioctl3 (int fd, unsigned request, long data);
+#else
 int ioctl (int fd, unsigned long request, ...);
 int ioctl3 (int fd, unsigned long request, long data);
+#endif

 #endif // ! SYSTEM_LIBC

--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@ -32,20 +32,20 @@ struct rusage
 {
  struct timeval ru_utime;
  struct timeval ru_stime;
-  long int ru_maxrss;
-  long int ru_ixrss;
-  long int ru_idrss;
-  long int ru_isrss;
-  long int ru_minflt;
-  long int ru_majflt;
-  long int ru_nswap;
-  long int ru_inblock;
-  long int ru_oublock;
-  long int ru_msgsnd;
-  long int ru_msgrcv;
-  long int ru_nsignals;
-  long int ru_nvcsw;
-  long int ru_nivcsw;
+  long ru_maxrss;
+  long ru_ixrss;
+  long ru_idrss;
+  long ru_isrss;
+  long ru_minflt;
+  long ru_majflt;
+  long ru_nswap;
+  long ru_inblock;
+  long ru_oublock;
+  long ru_msgsnd;
+  long ru_msgrcv;
+  long ru_nsignals;
+  long ru_nvcsw;
+  long ru_nivcsw;
 };

 #define RUSAGE_SELF 0
--- a/include/sys/types.h
+++ b/include/sys/types.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -32,7 +32,12 @@
 #endif

 #ifndef EOF
-#define EOF -1
+// FIXME M2_Planet chokes on -1, even inside #if ! __M2__
+#if __arm__ || __i386__
+#define EOF 0xffffffff
+#else
+#define EOF 0xffffffffffffffff
+#endif
 #endif

 #ifndef NULL
@ -66,15 +71,23 @@ typedef unsigned gid_t;
 #ifndef __MES_INO_T
 #define __MES_INO_T
 #undef ino_t
+#if __M2__
+typedef unsigned ino_t;
+#else
 typedef unsigned long ino_t;
 #endif
+#endif

 #if __SIZEOF_LONG_LONG__ == 8
 #ifndef __MES_INO64_T
 #define __MES_INO64_T
 #undef ino64_t
+#if __M2__
+typedef unsigned ino64_t;
+#else
 typedef unsigned long long ino64_t;
 #endif
+#endif
 #endif // __SIZEOF_LONG_LONG__ == 8

 #if !defined (__MES_INTPTR_T) && !defined (__intptr_t_defined)
@ -83,8 +96,12 @@ typedef unsigned long long ino64_t;
 #undef intptr_t
 typedef long intptr_t;
 #undef uintptr_t
+#if __M2__
+typedef unsigned uintptr_t;
+#else
 typedef unsigned long uintptr_t;
 #endif
+#endif

 #ifndef __MES_OFF_T
 #define __MES_OFF_T
@ -96,8 +113,12 @@ typedef long off_t;
 #ifndef __MES_OFF64_T
 #define __MES_OFF64_T
 #undef off64_t
+#if __M2__
+typedef unsigned off64_t;
+#else
 typedef unsigned long long off64_t;
 #endif
+#endif
 #endif // __SIZEOF_LONG_LONG__ == 8

 #ifndef __MES_PID_T
@ -126,9 +147,13 @@ typedef long sigval_t;
 #ifndef __MES_SIZE_T
 #define __MES_SIZE_T
 #undef size_t
+#if __M2__
+typedef unsigned size_t;
+#else
 typedef unsigned long size_t;
 #endif
 #endif
+#endif

 #ifndef __MES_SSIZE_T
 #define __MES_SSIZE_T
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -20,6 +20,8 @@
 #ifndef __MES_SYS_WAIT_H
 #define __MES_SYS_WAIT_H 1

+#include <sys/resource.h>
+
 #if SYSTEM_LIBC
 #undef __MES_SYS_WAIT_H
 #include_next <sys/wait.h>
@ -35,6 +37,8 @@ typedef int pid_t;

 pid_t waitpid (pid_t pid, int *status_ptr, int options);
 pid_t wait (int *status_ptr);
+pid_t wait4 (pid_t pid, int *wstatus, int options,
+             struct rusage *rusage);

 #endif // ! SYSTEM_LIBC

--- a/include/time.h
+++ b/include/time.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -27,8 +27,8 @@

 #ifndef __MES_TIME_T
 #define __MES_TIME_T 1
-typedef long int clockid_t;
-typedef long int time_t;
+typedef long clockid_t;
+typedef long time_t;
 #endif

 struct tm
--- a/kaem.arm
+++ b/kaem.arm
@ -0,0 +1,24 @@
+#! /bin/sh
+# Copyright © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+#
+# This file is part of GNU Mes.
+#
+# GNU Mes is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Mes is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+# Usage:
+# kaem --verbose --strict
+
+mes_cpu=arm
+stage0_cpu=armv7l
+kaem --verbose --strict
--- a/kaem.run
+++ b/kaem.run
@ -25,35 +25,41 @@ stage0_cpu=${stage0_cpu:-x86}
 mkdir -p m2

 M2-Planet                                       \
-    --bootstrap-mode                            \
    --debug                                     \
    --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -D __linux__=1                              \
+    -f include/mes/config.h                     \
+    -f include/mes/lib-mini.h                   \
+    -f include/mes/lib.h                        \
    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
    -f lib/mes/globals.c                        \
    -f lib/m2/cast.c                            \
-    -f lib/m2/exit.c                            \
-    -f lib/mes/mini-write.c                     \
-    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
+    -f lib/stdlib/exit.c                        \
+    -f lib/mes/write.c                          \
    -f include/linux/${mes_cpu}/syscall.h       \
+    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
    -f lib/stub/__raise.c                       \
    -f lib/linux/brk.c                          \
-    -f lib/m2/malloc.c                          \
+    -f lib/linux/malloc.c                       \
    -f lib/string/memset.c                      \
-    -f lib/m2/read.c                            \
+    -f lib/linux/read.c                         \
    -f lib/mes/fdgetc.c                         \
    -f lib/stdio/getchar.c                      \
    -f lib/stdio/putchar.c                      \
-    -f lib/m2/open.c                            \
-    -f lib/m2/mes_open.c                        \
+    -f lib/stub/__buffered_read.c               \
+    -f lib/linux/_open3.c                       \
+    -f lib/linux/open.c                         \
+    -f lib/mes/mes_open.c                       \
    -f lib/string/strlen.c                      \
    -f lib/mes/eputs.c                          \
    -f lib/mes/fdputc.c                         \
    -f lib/mes/eputc.c                          \
                                                \
-    -f include/m2/types.h                       \
+    -f include/time.h                           \
+    -f include/sys/time.h                       \
+    -f include/sys/types.h                      \
    -f include/mes/mes.h                        \
    -f include/mes/builtins.h                   \
    -f include/mes/constants.h                  \
@ -84,17 +90,21 @@ M2-Planet                                       \
    -f lib/linux/access.c                       \
    -f include/linux/m2/kernel-stat.h           \
    -f include/sys/stat.h                       \
-    -f lib/m2/chmod.c                           \
+    -f lib/linux/chmod.c                        \
    -f lib/linux/ioctl3.c                       \
+    -f include/sys/ioctl.h                      \
    -f lib/m2/isatty.c                          \
    -f lib/linux/fork.c                         \
    -f lib/m2/execve.c                          \
    -f lib/m2/execv.c                           \
-    -f lib/m2/waitpid.c                         \
+    -f include/sys/resource.h                   \
+    -f lib/linux/wait4.c                        \
+    -f lib/linux/waitpid.c                      \
    -f lib/linux/gettimeofday.c                 \
-    -f lib/m2/clock_gettime.c                   \
+    -f lib/linux/clock_gettime.c                \
    -f lib/m2/time.c                            \
    -f lib/linux/_getcwd.c                      \
+    -f include/limits.h                         \
    -f lib/m2/getcwd.c                          \
    -f lib/linux/dup.c                          \
    -f lib/linux/dup2.c                         \
@ -105,6 +115,7 @@ M2-Planet                                       \
    -f src/core.c                               \
    -f src/display.c                            \
    -f src/eval-apply.c                         \
+    -f include/fcntl.h                          \
    -f src/gc.c                                 \
    -f src/hash.c                               \
    -f src/lib.c                                \
@ -112,6 +123,7 @@ M2-Planet                                       \
    -f src/math.c                               \
    -f src/mes.c                                \
    -f src/module.c                             \
+    -f include/signal.h                         \
    -f src/posix.c                              \
    -f src/reader.c                             \
    -f src/stack.c                              \
--- a/kaem.x86
+++ b/kaem.x86
@ -0,0 +1,24 @@
+#! /bin/sh
+# Copyright © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+#
+# This file is part of GNU Mes.
+#
+# GNU Mes is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Mes is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+# Usage:
+# kaem --verbose --strict
+
+mes_cpu=x86
+stage0_cpu=x86
+kaem --verbose --strict
--- a/lib/ctype/isdigit.c
+++ b/lib/ctype/isdigit.c
@ -1,7 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
 * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- * Copyright © 2023 Rick Masters <grick23@gmail.com>
 *
 * This file is part of GNU Mes.
 *
--- a/lib/ctype/isxdigit.c
+++ b/lib/ctype/isxdigit.c
@ -24,5 +24,5 @@
 int
 isxdigit (int c)
 {
-  return isdigit (c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+  return isdigit (c) || (c >= 'a' && c <= 'f');
 }
--- a/lib/linux/_open3.c
+++ b/lib/linux/_open3.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -26,7 +26,9 @@
 int
 _open3 (char const *file_name, int flags, int mask)
 {
-  int r = _sys_call3 (SYS_open, (long) file_name, (int) flags, (int) mask);
+  long long_file_name = cast_voidp_to_long (file_name);
+  int r = _sys_call3 (SYS_open, long_file_name, flags, mask);
+  __ungetc_init ();
  if (r > 2)
    {
      __ungetc_clear (r);
--- a/lib/linux/lseek.c
+++ b/lib/linux/lseek.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -24,23 +24,23 @@
 #include <stdio.h>
 #include <sys/types.h>

-#if !__MESC__ /* FIXME: We want bin/mes-mescc's x86-linux sha256sum to stay the same. */
 off_t
 _lseek (int filedes, off_t offset, int whence)
 {
-  return _sys_call3 (SYS_lseek, (int) filedes, (long) offset, (int) whence);
+  long long_offset = offset;
+  return _sys_call3 (SYS_lseek, filedes, long_offset, whence);
 }
-#endif

 off_t
 lseek (int filedes, off_t offset, int whence)
 {
-#if !__MESC__ /* FIXME: We want bin/mes-mescc's x86-linux sha256sum to stay the same. */
+#if !__MESC__ && !__M2__
  if (_lseek (filedes, 0, SEEK_CUR) == -1)
    return -1;
 #endif
  size_t skip = __buffered_read_clear (filedes);
  if (whence == SEEK_CUR)
    offset -= skip;
-  return _sys_call3 (SYS_lseek, (int) filedes, (long) offset, (int) whence);
+  long long_offset = offset;
+  return _sys_call3 (SYS_lseek, filedes, long_offset, whence);
 }
--- a/lib/linux/malloc.c
+++ b/lib/linux/malloc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 * Copyright © 2021 Danny Milosavljevic <dannym@scratchpost.org>
 *
 * This file is part of GNU Mes.
@ -31,9 +31,11 @@ malloc (size_t size)
 {
  if (!__brk)
    __brk = cast_long_to_charp (brk (0));
+#if !__M2__
  /* align what we give back. */
  __brk = (char*) (((uintptr_t) __brk
                    + sizeof (max_align_t) - 1) & -sizeof (max_align_t));
+#endif
  if (brk (__brk + size) == -1)
    return 0;
  char *p = __brk;
--- a/lib/linux/open.c
+++ b/lib/linux/open.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <stdarg.h>

+#if __M2__
 int
 open (char *file_name, int flags, int mask)
 {
@ -32,3 +33,17 @@ open (char *file_name, int flags, int mask)
    __ungetc_clear (r);
  return r;
 }
+#else // !__M2__
+int
+open (char const *file_name, int flags, ...)
+{
+  va_list ap;
+  va_start (ap, flags);
+  int mask = va_arg (ap, int);
+  int r = _sys_call3 (SYS_open, (long) file_name, flags, mask);
+  va_end (ap);
+  if (r > 2)
+    __ungetc_clear (r);
+  return r;
+}
+#endif // !__M2__
--- a/lib/linux/read.c
+++ b/lib/linux/read.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,16 +18,18 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <mes/lib.h>
 #include <linux/syscall.h>
 #include <arch/syscall.h>
-#include <mes/lib.h>
 #include <fcntl.h>

 ssize_t
 read (int filedes, void *buffer, size_t size)
 {
  long long_filedes = filedes;
-  ssize_t bytes = _sys_call3 (SYS_read, long_filedes, (long) buffer, (long) size);
+  long long_buffer = cast_voidp_to_long (buffer);
+  ssize_t bytes = _sys_call3 (SYS_read, long_filedes, long_buffer, size);
+#if !__M2__
  if (__mes_debug () > 4)
    {
      if (bytes == 1)
@ -48,5 +50,6 @@ read (int filedes, void *buffer, size_t size)
          eputs ("\n");
        }
    }
+#endif
  return bytes;
 }
--- a/lib/linux/signal.c
+++ b/lib/linux/signal.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018,2019,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -36,7 +36,7 @@ sighandler_t
 signal (int signum, sighandler_t action)
 {
 #if __i386__
-  return (sighandler_t) _sys_call2 (SYS_signal, signum, (long) action);
+  return _sys_call2 (SYS_signal, signum, action);
 #else
  static struct sigaction setup_action = { 0 };
  static struct sigaction old = { 0 };
--- a/lib/linux/wait4.c
+++ b/lib/linux/wait4.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -22,18 +22,15 @@
 #include <linux/syscall.h>
 #include <arch/syscall.h>
 #include <sys/types.h>
+#include <sys/resource.h>

-int
-waitpid (int pid, int *status_ptr, int options)
+pid_t
+wait4 (pid_t pid, int *status_ptr, int options, struct rusage *rusage)
 {
  long long_pid = pid;
  long long_status_ptr = cast_voidp_to_long (status_ptr);
  long long_options = options;
-//##if __i386__
-//#  return _sys_call3 (SYS_waitpid, long_pid, long_status_ptr, long_options);
-//##elif __x86_64__ || __arm__
-  return _sys_call4 (SYS_wait4, long_pid, long_status_ptr, long_options, 0);
-//##else
-//##error arch not supported
-//##endif
+  long long_rusage = cast_voidp_to_long (rusage);
+  return _sys_call4 (SYS_wait4, long_pid, long_status_ptr, long_options,
+                     long_rusage);
 }
--- a/lib/linux/waitpid.c
+++ b/lib/linux/waitpid.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,6 +18,7 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <mes/lib.h>
 #include <linux/syscall.h>
 #include <arch/syscall.h>
 #include <sys/types.h>
@ -25,11 +26,12 @@
 pid_t
 waitpid (pid_t pid, int *status_ptr, int options)
 {
-#if __i386__
-  return _sys_call3 (SYS_waitpid, (long) pid, (long) status_ptr, (int) options);
-#elif __x86_64__ || __arm__
-  return _sys_call4 (SYS_wait4, (long) pid, (long) status_ptr, (int) options, 0);
-#else
-#error arch not supported
+  long long_pid = pid;
+  long long_status_ptr = cast_voidp_to_long (status_ptr);
+  long long_options = options;
+#if SYS_waitpid
+  return _sys_call3 (SYS_waitpid, long_pid, long_status_ptr, long_options);
+#elif SYS_wait4
+  return wait4 (pid, status_ptr, options, 0);
 #endif
 }
--- a/lib/m2/chmod.c
+++ b/lib/m2/chmod.c
@ -1,31 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/syscall.h>
-#include <syscall.h>
-#include <sys/stat.h>
-
-int
-chmod (char const *file_name, int mask)
-{
-  long long_file_name = file_name;
-  long long_mask = mask;
-  return _sys_call2 (SYS_chmod, long_file_name, long_mask);
-}
--- a/lib/m2/clock_gettime.c
+++ b/lib/m2/clock_gettime.c
@ -1,30 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/syscall.h>
-#include <syscall.h>
-#include <time.h>
-
-int
-clock_gettime (long clk_id, struct timespec *tp)
-{
-  long long_tp = tp;
-  return _sys_call2 (SYS_clock_gettime, clk_id, tp);
-}
--- a/lib/m2/getcwd.c
+++ b/lib/m2/getcwd.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <sys/types.h>

-// CONSTANT PATH_MAX 1024
-
 char *__getcwd_buf;

 char *
--- a/lib/m2/isatty.c
+++ b/lib/m2/isatty.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -24,7 +24,6 @@
 #include <string.h>
 #include <termio.h>

-// CONSTANT TCGETS 0x5401
 #define TCGETS 0x5401

 struct ktermios
--- a/lib/m2/malloc.c
+++ b/lib/m2/malloc.c
@ -1,36 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <mes/lib.h>
-#include <string.h>
-
-char *__brk = 0;
-
-void *
-malloc (size_t size)
-{
-  if (!__brk)
-    __brk = cast_long_to_charp (brk (0));
-  if (brk (__brk + size) == -1)
-    return 0;
-  char *p = __brk;
-  __brk = __brk + size;
-  return p;
-}
--- a/lib/m2/mes_open.c
+++ b/lib/m2/mes_open.c
@ -1,28 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-int
-mes_open (char *file_name, int flags, int mask)
-{
-  int filedes = open (file_name, flags, mask);
-  if (filedes > 2)
-    __ungetc_clear (filedes);
-  return filedes;
-}
--- a/lib/m2/read.c
+++ b/lib/m2/read.c
@ -1,31 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/syscall.h>
-#include <syscall.h>
-#include <mes/lib.h>
-#include <fcntl.h>
-
-long
-read (int filedes, void *buffer, long size)
-{
-  long bytes = _sys_call3 (SYS_read, filedes, buffer, size);
-  return bytes;
-}
--- a/lib/mes/__assert_fail.c
+++ b/lib/mes/__assert_fail.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -19,30 +19,14 @@
 */

 #include <mes/lib.h>
-#include <assert.h>

 void
-__assert_fail (char const *msg, char const *file, unsigned line,
-               char const *function)
+__assert_fail (char *s)
 {
-  if (file && file[0])
-    {
-      eputs (file);
-      eputs (":");
-    }
-  if (line)
-    {
-      eputs (itoa (line));
-      eputs (":");
-    }
-  if (function && function[0])
-    {
-      eputs (function);
-      eputs (":");
-    }
  eputs ("assert fail: ");
-  eputs (msg);
+  eputs (s);
  eputs ("\n");
-  char *fail = 0;
+  char *fail = s;
+  fail = 0;
  fail[0] = 0;
 }
--- a/lib/mes/abtol.c
+++ b/lib/mes/abtol.c
@ -1,7 +1,7 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
 * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- * Copyright © 2022,2023 Rick Masters <grick23@gmail.com>
+ * Copyright © 2022 Rick Masters <grick23@gmail.com>
 *
 * This file is part of GNU Mes.
 *
@ -43,15 +43,10 @@ abtol (char const **p, int base)
  while (isnumber (s[0], base) != 0)
    {
      i = i * base;
-      if (s[0] >= 'a')
+      if (s[0] > '9')
        m = 'a' - 10;
      else
-        {
-          if (s[0] >= 'A')
-            m = 'A' - 10;
-          else
-            m = '0';
-        }
+        m = '0';
      i = i + s[0] - m;
      s = s + 1;
    }
--- a/lib/mes/assert_msg.c
+++ b/lib/mes/assert_msg.c
@ -1,7 +1,7 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
 * Copyright © 2019 Jeremiah Orians <jeremiah@pdp10.guru>
- * Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -20,12 +20,11 @@
 */

 #include <mes/lib.h>
-#include <assert.h>
 #include <stdlib.h>

 void
 assert_msg (int bool, char *msg)
 {
  if (bool == 0)
-    __assert_fail (msg, 0, 0, 0);
+    __assert_fail (msg);
 }
--- a/lib/mes/ntoab.c
+++ b/lib/mes/ntoab.c
@ -23,7 +23,19 @@
 #include <stdlib.h>
 #include <string.h>

-#if __M2_PLANET__ || (!(__MESC__ && __arm__) && !(__TINYC__ && __arm__ && BOOTSTRAP))
+#if __MESC__ && __arm__
+#define __MESC__and__arm__
+#endif
+
+#if __TINYC__ && __arm__ && BOOTSTRAP
+#define __TINYC__and__arm__and__BOOTSTRAP
+#endif
+
+#define __not__MESC__arm__and__not__TINYC__arm__BOOTSTRAP !defined (__MESC__and__arm__) && !defined (__TINYC__and__arm__and__BOOTSTRAP)
+
+// FIXME: M2-Planet 1.10.0 crashes on this...
+// #if __M2__ || (!defined (__MESC__and__arm__) && !defined (__TINYC__and__arm__and__BOOTSTRAP))
+#if __M2__ || __not__MESC__arm__and__not__TINYC__arm__BOOTSTRAP
 size_t
 __mesabi_uldiv (size_t a, size_t b, size_t *remainder)
 {
--- a/lib/mes/mini-write.c
+++ b/lib/mes/mini-write.c
--- a/lib/posix/getcwd.c
+++ b/lib/posix/getcwd.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -23,8 +23,6 @@
 #include <sys/types.h>
 #include <mes/lib.h>

-char *__getcwd_buf;
-
 char *
 getcwd (char *buffer, size_t size)
 {
--- a/lib/posix/getenv.c
+++ b/lib/posix/getenv.c
@ -1,6 +1,6 @@
 /*
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -22,9 +22,6 @@
 #include <string.h>
 #include <stdlib.h>

-// CONSTANT M2_PTR_SIZE 4
-#define M2_PTR_SIZE 1
-
 char *
 getenv (char const *s)
 {
--- a/lib/posix/open.c
+++ b/lib/posix/open.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -29,6 +29,13 @@ _open2 (char const *file_name, int flags)
  return _open3 (file_name, flags, mask);
 }

+#if __M2__
+int
+open (char const *file_name, int flags, int mask)
+{
+  return _open3 (file_name, flags, mask);
+}
+#else // !__M2__
 int
 open (char const *file_name, int flags, ...)
 {
@ -44,3 +51,4 @@ open (char const *file_name, int flags, ...)
  else
    return _open2 (file_name, flags);
 }
+#endif // !__M2__
--- a/lib/posix/setenv.c
+++ b/lib/posix/setenv.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -22,9 +22,6 @@
 #include <string.h>
 #include <stdlib.h>

-// CONSTANT M2_PTR_SIZE 4
-#define M2_PTR_SIZE 1
-
 int
 setenv (char const *s, char const *v, int overwrite_p)
 {
--- a/lib/stdio/vfscanf.c
+++ b/lib/stdio/vfscanf.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018,2019,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -22,7 +22,6 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>

 int
 vfscanf (FILE * stream, char const *template, va_list ap)
@ -77,7 +76,7 @@ vfscanf (FILE * stream, char const *template, va_list ap)
              ungetc (p, stream);
              *q = 0;
              q = buf;
-              *d = abtol ((char const**)&q, 10);
+              *d = abtol (&q, 10);
              count++;
              break;
            }
--- a/lib/stdlib/exit.c
+++ b/lib/stdlib/exit.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -20,12 +20,16 @@

 #include <mes/lib.h>

+#if !__M2__
 void (*__call_at_exit) (void);
+#endif

 void
 exit (int code)
 {
+#if !__M2__
  if (__call_at_exit)
    (*__call_at_exit) ();
+#endif
  _exit (code);
 }
--- a/lib/stdlib/mbstowcs.c
+++ b/lib/stdlib/mbstowcs.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -30,6 +30,6 @@ mbstowcs (wchar_t * wstring, char const *string, size_t size)
  if (__mes_debug () && !stub)
    eputs ("mbstowcs stub\n");
  stub = 1;
-  strcpy ((char*)wstring, string);
+  strcpy (wstring, string);
  return strlen (string);
 }
--- a/lib/stub/__buffered_read.c
+++ b/lib/stub/__buffered_read.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -19,11 +19,15 @@
 */

 #include <mes/lib.h>
-
-void _exit (int code);
+#include <stdlib.h>
+#include <string.h>

 void
-exit (int code)
+__buffered_read_init (int filedes)
+{
+}
+
+size_t
+__buffered_read_clear (int filedes)
 {
-  _exit (code);
 }
--- a/lib/stub/__raise.c
+++ b/lib/stub/__raise.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,8 +18,6 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-// CONSTANT SIGABRT 0
-
 int
 __raise (int signum)
 {
--- a/mes/module/mes/repl.mes
+++ b/mes/module/mes/repl.mes
@ -1,7 +1,7 @@
 ;;; -*-scheme-*-

 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018,2019,2020,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@ -29,7 +29,7 @@

 (define welcome
  (string-append "GNU Mes " %version "
-Copyright (C) 2016,2017,2018,2019,2020,2021,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+Copyright (C) 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 Copyright (C) 2019,2020,2021 Danny Milosavljevic <dannym@scratchpost.org>
 and others.

--- a/scaffold/argv.kaem
+++ b/scaffold/argv.kaem
@ -24,15 +24,14 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}

 M2-Planet                                       \
-    --bootstrap-mode                            \
    --debug                                     \
    --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -f include/mes/lib-mini.h                   \
    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
    -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/mes/eputs.c                          \
    -f lib/string/strcmp.c                      \
    -f scaffold/argv.c                          \
--- a/scaffold/global-array.kaem
+++ b/scaffold/global-array.kaem
@ -30,7 +30,7 @@ M2-Planet                                       \
    -f lib/mes/globals.c                        \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/string/strlen.c                      \
    -f lib/string/strcpy.c                      \
    -f lib/mes/eputs.c                          \
--- a/scaffold/hello.kaem
+++ b/scaffold/hello.kaem
@ -24,15 +24,14 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}

 M2-Planet                                       \
-    --bootstrap-mode                            \
    --debug                                     \
    --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
+    -f include/mes/lib-mini.h                   \
    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
    -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/mes/eputs.c                          \
    -f scaffold/hello.c                         \
    -o scaffold/hello.M1
--- a/scaffold/local-array.kaem
+++ b/scaffold/local-array.kaem
@ -30,7 +30,7 @@ M2-Planet                                       \
    -f lib/mes/globals.c                        \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/string/strlen.c                      \
    -f lib/string/strcpy.c                      \
    -f lib/mes/eputs.c                          \
--- a/scaffold/local-static-array.kaem
+++ b/scaffold/local-static-array.kaem
@ -30,7 +30,7 @@ M2-Planet                                       \
    -f lib/mes/globals.c                        \
    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/string/strlen.c                      \
    -f lib/string/strcpy.c                      \
    -f lib/mes/eputs.c                          \
--- a/scaffold/main.kaem
+++ b/scaffold/main.kaem
@ -24,7 +24,6 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}

 M2-Planet                                       \
-    --bootstrap-mode                            \
    --debug                                     \
    --architecture ${stage0_cpu}                \
    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
--- a/scaffold/read.kaem
+++ b/scaffold/read.kaem
@ -24,28 +24,29 @@ mes_cpu=${mes_cpu:-x86}
 stage0_cpu=${stage0_cpu:-x86}

 M2-Planet                                       \
-    --bootstrap-mode                            \
    --debug                                     \
    --architecture ${stage0_cpu}                \
-    -f include/m2/lib.h                         \
    -f lib/linux/${mes_cpu}-mes-m2/crt1.c       \
-    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
+    -f include/mes/lib-mini.h                   \
    -f lib/linux/${mes_cpu}-mes-m2/_write.c     \
-    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
+    -f lib/linux/${mes_cpu}-mes-m2/_exit.c      \
    -f include/linux/${mes_cpu}/syscall.h       \
+    -f lib/linux/${mes_cpu}-mes-m2/syscall.c    \
    -f lib/m2/cast.c                            \
+    -f include/mes/lib.h                        \
    -f lib/string/strlen.c                      \
-    -f lib/mes/mini-write.c                     \
+    -f lib/mes/write.c                          \
    -f lib/mes/eputs.c                          \
    -f lib/linux/brk.c                          \
-    -f lib/m2/malloc.c                          \
+    -f lib/linux/malloc.c                       \
    -f lib/string/memset.c                      \
-    -f lib/m2/read.c                            \
+    -f lib/linux/read.c                         \
    -f lib/mes/fdgetc.c                         \
    -f lib/stdio/getchar.c                      \
    -f lib/stdio/putchar.c                      \
-    -f lib/m2/open.c                            \
-    -f lib/m2/mes_open.c                        \
+    -f lib/linux/open.c                         \
+    -f include/sys/types.h                      \
+    -f include/stdio.h                          \
    -f scaffold/read.c                          \
    -o scaffold/read.M1

--- a/simple.make
+++ b/simple.make
@ -33,7 +33,7 @@ M2_PLANET_FUBAR = i386

 #M2_PLANET_ARCH = amd64
 #M2_PLANET_FUBAR = amd64
-M2_PLANET_FLAGS = --bootstrap-mode --debug --architecture $(M2_PLANET_ARCH)
+M2_PLANET_FLAGS = --debug --architecture $(M2_PLANET_ARCH)

 CFLAGS:=					\
  $(CFLAGS)					\
@ -76,22 +76,26 @@ M2_SOURCES =					\
 lib/linux/x86-mes-m2/crt1.c			\
 lib/linux/x86-mes-m2/_exit.c			\
 lib/linux/x86-mes-m2/_write.c			\
- lib/mes/globals.c	                        \
+ lib/mes/globals.c				\
 lib/m2/cast.c					\
- lib/m2/exit.c					\
- lib/mes/mini-write.c				\
+ lib/stdlib/exit.c				\
+ lib/stub/__buffered_read.c			\
 lib/linux/x86-mes-m2/syscall.c			\
 lib/stub/__raise.c				\
 lib/linux/brk.c				\
- lib/m2/malloc.c				\
+ lib/linux/malloc.c				\
 lib/string/memset.c				\
-						\
- lib/m2/read.c					\
+ lib/linux/read.c				\
 lib/mes/fdgetc.c				\
+ lib/linux/lseek.c				\
+ lib/posix/write.c				\
+						\
 lib/stdio/getchar.c				\
 lib/stdio/putchar.c				\
- lib/m2/open.c					\
- lib/m2/mes_open.c				\
+ lib/stub/__buffered_read.c			\
+ lib/linux/_open3.c				\
+ lib/linux/open.c				\
+ lib/mes/mes_open.c				\
 lib/string/strlen.c				\
 lib/mes/eputs.c				\
 lib/mes/fdputc.c				\
@ -120,15 +124,16 @@ M2_SOURCES =					\
 lib/mes/fdungetc.c				\
 lib/posix/setenv.c				\
 lib/linux/access.c				\
- lib/m2/chmod.c					\
+ lib/linux/chmod.c				\
 lib/linux/ioctl3.c  				\
 lib/m2/isatty.c				\
 lib/linux/fork.c				\
 lib/m2/execve.c				\
 lib/m2/execv.c					\
- lib/m2/waitpid.c				\
+ lib/linux/wait4.c				\
+ lib/linux/waitpid.c				\
 lib/linux/gettimeofday.c			\
- lib/m2/clock_gettime.c				\
+ lib/linux/clock_gettime.c			\
 lib/m2/time.c					\
 lib/linux/_getcwd.c				\
 lib/m2/getcwd.c				\
@ -139,12 +144,6 @@ M2_SOURCES =					\
 lib/linux/unlink.c				\
 src/m2.c

-M2_TODO =					\
- lib/m2/file_print.c				\
- lib/mes/ntoab.c				\
- lib/mes/fdgetc.c				\
- lib/mes/fdungetc.c
-
 INCLUDES =					\
 include/mes/builtins.h				\
 include/mes/constants.h			\
@ -172,8 +171,7 @@ GCC_SOURCES =					\
 lib/mes/itoa.c					\
 lib/mes/ltoa.c					\
 lib/mes/assert_msg.c				\
- src/cc.c					\
- src/globals.c
+ src/cc.c

 mes-gcc: bin/mes-gcc
 mes-m2: bin/mes-m2
@ -182,15 +180,26 @@ gc-gcc: bin/gc-gcc
 gc-m2: bin/gc-m2

 bin/mes-gcc: simple.make $(GCC_SOURCES) $(MES_SOURCES) $(INCLUDES) | bin
-	$(CC) $(CFLAGS) -o $@ $(GCC_SOURCES) $(MES_SOURCES)
+	$(CC) $(CFLAGS) $(GCC_SOURCES) $(MES_SOURCES) -o $@
 	cp -f $@ bin/mes

 bin/gc-gcc: simple.make $(GCC_SOURCES) $(TEST_GC_SOURCES) $(INCLUDES) | bin
-	$(CC) $(CFLAGS) -D GC_TEST=1 -o $@ $(GCC_SOURCES) $(TEST_GC_SOURCES)
+	$(CC) $(CFLAGS) -D GC_TEST=1 $(GCC_SOURCES) $(TEST_GC_SOURCES) -o $@

 M2_PLANET_INCLUDES =				\
- include/m2/lib.h				\
+ include/mes/config.h				\
+ include/mes/lib-mini.h				\
+ include/mes/lib.h				\
 include/linux/x86/syscall.h			\
+ include/time.h					\
+ include/sys/time.h				\
+ include/sys/types.h				\
+ include/stdio.h				\
+ include/limits.h				\
+ include/sys/resource.h				\
+ include/sys/stat.h				\
+ include/fcntl.h				\
+ include/signal.h				\
 include/mes/mes.h				\
 include/mes/builtins.h				\
 include/mes/constants.h			\
@ -201,10 +210,10 @@ M2_PLANET_SOURCES =				\
 $(M2_PLANET_INCLUDES:%.h=%.h)			\
 $(M2_SOURCES)

-m2/mes-m2.M1: simple.make $(M2_PLANET_SOURCES) $(MES_SOURCES) $(M2_PLANET_INCLUDES) | m2
+m2/mes-m2.M1: simple.make $(M2_PLANET_SOURCES) $(MES_SOURCES) $(M2_PLANET_INCLUDES) | bin
 	$(M2_PLANET) $(M2_PLANET_FLAGS) $(M2_PLANET_SOURCES:%=-f %)  $(MES_SOURCES:%.c=-f %.c) -o $@ || rm -f $@

-m2/mes-m2.blood-elf.M1: m2/mes-m2.M1 | m2
+m2/mes-m2.blood-elf.M1: m2/mes-m2.M1
 	blood-elf --little-endian -f $< -o $@

 m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1
@ -218,7 +227,7 @@ m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1
 	    -f m2/mes-m2.blood-elf.M1		\
 	    -o $@

-bin/mes-m2: m2/mes-m2.hex2 | bin
+bin/mes-m2: m2/mes-m2.hex2
 	hex2						\
 	    --architecture $(M2_PLANET_ARCH)		\
 	    --little-endian				\
@ -253,17 +262,14 @@ check-gc: $(MES)
 check-mescc: $(MES)
 	rm -f a.out
 # this already needs succesful GC
-#	LIBRARY_PATH=lib MES_DEBUG=1 MES_PREFIX=mes MES=$(MES) sh -x scripts/mescc -- -I include -nostdlib lib/mes/globals.c lib/string/strlen.c lib/mes/eputs.c scaffold/hello.c
-	LIBRARY_PATH=lib MES_DEBUG=1 MES_PREFIX=mes MES=$(MES) sh -x scripts/mescc -- -m 32 -I include -nostdlib lib/mes/globals.c lib/linux/$(MESCC_CPU)-mes-mescc/crt1.c scaffold/main.c
+#	MES_DEBUG=1 MES_PREFIX=mes MES=$(MES) sh -x scripts/mescc -- -I include -nostdlib lib/string/strlen.c lib/mes/eputs.c scaffold/hello.c
+	MES_DEBUG=1 MES_PREFIX=mes MES=$(MES) sh -x scripts/mescc -- -m 32 -I include -nostdlib lib/linux/$(MESCC_CPU)-mes-mescc/crt1.c scaffold/main.c
 	./a.out; r=$$?; if [ $$r != 42 ]; then exit 1; fi


 # Directories
 bin:
-	mkdir -p $@
-
-m2:
-	mkdir -p $@
+	mkdir -p bin

 TAGS:
 	etags $(shell find . -name '*.c' -o -name '*.h') --language=scheme $(shell find mes module -name '*.mes' -o -name '*.scm')
--- a/simple.sh
+++ b/simple.sh
@ -1,7 +1,7 @@
 #! /bin/sh

 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019,2020,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@ -36,9 +36,7 @@ cat > include/mes/config.h <<EOF
 EOF

 ## Build ##
-gcc -g -D HAVE_CONFIG_H=1                       \
-    -I include                                  \
-    -I include/$mes_kernel/$mes_cpu             \
+gcc -g -D HAVE_CONFIG_H=1 -I include            \
    -o out-system-libc/mes                      \
                                                \
    lib/mes/eputs.c                             \
@ -109,7 +107,7 @@ MES_DEBUG=3 MES_ARENA=10000 MES_MAX_ARENA=10000 MES_BOOT=tests/gc.test out-syste
 #          lib/linux/$mes_cpu-mes-mescc/_write.c\
 #          \
 #          lib/mes/globals.c\
-#          lib/mes/mini-write.c\
+#          lib/mes/write.c\
 #          lib/string/strlen.c\
 #          \
 #          scaffold/hello.c
@ -123,7 +121,7 @@ cat                                             \
    lib/linux/$mes_cpu-mes-mescc/_write.c       \
                                                \
    lib/mes/globals.c                           \
-    lib/mes/mini-write.c                        \
+    lib/mes/write.c                             \
    lib/string/strlen.c                         \
                                                \
    scaffold/hello.c                            \
@ -165,15 +163,11 @@ cat > include/mes/config.h <<EOF
 #define MES_VERSION "git"
 EOF

-mkdir -p include/arch
-cp -f include/$mes_kernel/$mes_cpu/kernel-stat.h include/arch
-cp -f include/$mes_kernel/$mes_cpu/syscall.h include/arch
-
 ## Build ##
 compiler=gcc     # not configurable
 $CC -g -D HAVE_CONFIG_H=1                               \
    -I include -I include/$mes_kernel/$mes_cpu          \
-    -nostdinc -nostdlib                                 \
+       -nostdinc -nostdlib                              \
    -fno-builtin -fno-stack-protector                   \
    -o out-mes/mes                                      \
                                                        \
@ -263,6 +257,8 @@ $CC -g -D HAVE_CONFIG_H=1                               \
    lib/linux/_read.c                                   \
    lib/linux/time.c                                    \
    lib/linux/unlink.c                                  \
+    include/sys/resource.h                              \
+    lib/linux/wait4.c                                   \
    lib/linux/waitpid.c                                 \
    lib/linux/$mes_cpu-mes-$compiler/syscall.c          \
                                                        \
@ -313,7 +309,7 @@ MES_DEBUG=3 MES_ARENA=10000 MES_MAX_ARENA=10000 MES_BOOT=tests/gc.test out-mes/m
 #          lib/linux/$mes_cpu-mes-mescc/_write.c\
 #          \
 #          lib/mes/globals.c\
-#          lib/mes/mini-write.c\
+#          lib/mes/write.c\
 #          lib/string/strlen.c\
 #          \
 #          scaffold/hello.c
@ -327,7 +323,7 @@ cat                                             \
    lib/linux/$mes_cpu-mes-mescc/_write.c       \
                                                \
    lib/mes/globals.c                           \
-    lib/mes/mini-write.c                        \
+    lib/mes/write.c                             \
    lib/string/strlen.c                         \
                                                \
    scaffold/hello.c                            \
--- a/src/core.c
+++ b/src/core.c
@ -148,7 +148,7 @@ length (struct scm *x)
 struct scm *
 error (struct scm *key, struct scm *x)
 {
-#if !__MESC_MES__ && !__M2_PLANET__
+#if !__MESC_MES__ && !__M2__
  struct scm *throw = module_ref (R0, cell_symbol_throw);
  if (throw != cell_undefined)
    return apply (throw, cons (key, cons (x, cell_nil)), R0);
--- a/src/gc.c
+++ b/src/gc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 * Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
 *
 * This file is part of GNU Mes.
@ -31,9 +31,6 @@

 int g_dump_filedes;

-#define M2_CELL_SIZE 1U
-// CONSTANT M2_CELL_SIZE 12
-
 char *
 cell_bytes (struct scm *x)
 {
@ -41,16 +38,20 @@ cell_bytes (struct scm *x)
  return p + (2 * sizeof (long));
 }

+#if __M2__
+#define U10 10
+#define U100 100
+#else
 #define U10 10U
-// CONSTANT U10 10
 #define U100 100U
-// CONSTANT U100 100
+#endif
+
 void
 gc_init ()
 {
 #if SYSTEM_LIBC
  ARENA_SIZE = 100000000;       /* 2.3GiB */
-#elif ! __M2_PLANET__
+#elif ! __M2__
  ARENA_SIZE = 300000;          /* 32b: 3MiB, 64b: 6 MiB */
 #else
  ARENA_SIZE = 20000000;
--- a/src/posix.c
+++ b/src/posix.c
@ -35,7 +35,7 @@
 #include <unistd.h>

 #if SYSTEM_LIBC
-#define __raise(x) -1
+//#define __raise(x) -1
 #endif

 struct scm *
@ -377,13 +377,14 @@ waitpid_ (struct scm *pid, struct scm *options)
  return cons (make_number (child), make_number (status));
 }

-#if __x86_64__
+#if __M2__
+/* Milliseconds for everyone else.  */
+#define TIME_UNITS_PER_SECOND 1000
+#elif __x86_64__
 /* Nanoseconds on 64-bit systems with POSIX timers.  */
-// CONSTANT TIME_UNITS_PER_SECOND 1000000000
 #define TIME_UNITS_PER_SECOND 1000000000U
 #else
 /* Milliseconds for everyone else.  */
-// CONSTANT TIME_UNITS_PER_SECOND 1000
 #define TIME_UNITS_PER_SECOND 1000U
 #endif

@ -408,8 +409,12 @@ gettimeofday_ ()                /*:((name . "gettimeofday")) */
  return cons (make_number (time->tv_sec), make_number (time->tv_usec));
 }

+#if __M2__
+#define UL1000000000 1000000000
+#else
 #define UL1000000000 1000000000UL
-// CONSTANT UL1000000000 1000000000
+#endif
+
 long
 seconds_and_nanoseconds_to_long (long s, long ns)
 {
--- a/src/symbol.c
+++ b/src/symbol.c
@ -23,16 +23,6 @@

 #include <string.h>

-// char const *MES_VERSION = "0.24.2";
-
-#if __M2_PLANET__
-#define M2_CELL_SIZE 12
-// CONSTANT M2_CELL_SIZE 12
-#else
-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-#endif
-
 struct scm *
 init_symbol (struct scm *x, long type, char const *name)
 {
--- a/src/test/gc.c
+++ b/src/test/gc.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -24,9 +24,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-
 int g_debug;

 void
--- a/src/vector.c
+++ b/src/vector.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2016,2017,2018,2019,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -21,14 +21,6 @@
 #include "mes/lib.h"
 #include "mes/mes.h"

-#if __M2_PLANET__
-#define M2_CELL_SIZE 12
-// CONSTANT M2_CELL_SIZE 12
-#else
-#define M2_CELL_SIZE 1
-// CONSTANT M2_CELL_SIZE 12
-#endif
-
 struct scm *
 make_vector_ (long k, struct scm *e)
 {
Author	SHA1	Message	Date
Jan (janneke) Nieuwenhuizen	05d1087741	DRAFT lib: stat: Use SYS_stat64 for 32bit platforms. * include/linux/arm/syscall.h (SYS_stat64, SYS_lstat64, SYS_fstat64)[__SIZEOF_LONG_LONG__ == 8]: New defines. (SYS_stat, SYS_lstat, SYS_fstat)[__SIZEOF_LONG_LONG__ == 8]: Redefine them. * include/linux/x86/syscall.h (SYS_stat64, SYS_lstat64, SYS_fstat64)[__SIZEOF_LONG_LONG__ == 8]: New defines. (SYS_stat, SYS_lstat, SYS_fstat)[__SIZEOF_LONG_LONG__ == 8]: Redefine them. * include/sys/stat.h (struct stat): Move definition to... * include/linux/arm/kernel-stat.h, include/linux/m2/kernel-stat.h, include/linux/x86/kernel-stat.h, include/linux/x86_64/kernel-stat.h: These new files. * include/gnu/x86/kernel-stat.h: New file. * configure (main): Copy <srcdest>include/<kernel>/<arch>/.h to include/. configure.sh: Likewise. * .gitignore: Ignore them. Add copyright header. * build-aux/GNUmakefile.in (X86_ARCH_HEADERS, ARCH_HEADERS): New variables. (build): Use them. (include/arch/%.h, arch-dir): New targets. * build-aux/bootstrap.sh.in (AM_CPPFLAGS): Replace <srcdest>include/<kernel>/<cpu> with built ../include. * build-aux/build.sh.in (AM_CPPFLAGS): Likewise. * build-aux/install.sh.in: Also install built include.	2023-02-12 19:27:10 +01:00
Jan (janneke) Nieuwenhuizen	fe3e3fcb10	DRAFT lib/m2: time: Fix segfault by allocating timeval struct. Suggested by Meghan Denny <hello@nektro.net>. * lib/m2/time.c (__tv): New global variable. (time): Use it to allocate timeval struct.	2023-01-24 08:14:38 +01:00
Jan (janneke) Nieuwenhuizen	1c81749672	mescc: Fix Guile warnings. * module/mescc/mescc.scm (GUILE-with-output-to-file): Remove.n (with-output-to-file): Rename to... (with-output-to-file*): ...this. (mescc:preprocess, mescc:compile, infos->hex2): Update callers.	2023-01-08 10:18:46 +01:00
Jan (janneke) Nieuwenhuizen	ab7203c1d6	doc: Use HTTPS. * COPYING: Replace by new version (which uses HTTPS). * HACKING, README, doc/fdl-1.3.texi, doc/mes.texi: Use HTTPS.	2023-01-08 10:18:45 +01:00
Jan (janneke) Nieuwenhuizen	9ef3077213	doc: Update `HACKING'. * HACKING (SETUP): Update arm triplet.	2023-01-08 10:18:44 +01:00
Jan (janneke) Nieuwenhuizen	a156fb08b2	core: Move M2_PTR_SIZE, M2_CELL_SIZE to include file. * lib/posix/getenv.c (M2_PTR_SIZE), lib/posix/setenv.c (M2_PTR_SIZE): Move definition... * include/mes/lib-mini.h (M2_PTR_SIZE): ...here. * src/gc.c (M2_CELL_SIZE), src/symbol.c (M2_CELL_SIZE), src/test/gc.c (M2_CELL_SIZE), src/vector.c (M2_CELL_SIZE): Move definition... * include/mes/mes.h (M2_CELL_SIZE): ...here.	2022-05-07 10:50:06 +02:00
Jan (janneke) Nieuwenhuizen	97be538621	scaffold: Remove obsolete malloc. * scaffold/lib/stdlib/malloc.c: Remove.	2022-05-07 08:45:06 +02:00
Jan (janneke) Nieuwenhuizen	327074e7ff	time.c: include sys/time for gettimeofday. * lib/linux/time.c: Include <sys/time.h>.	2022-05-05 23:26:46 +02:00
Jan (janneke) Nieuwenhuizen	209ee8da2e	linux/read.c remove extra mes.h include.	2022-05-05 23:26:28 +02:00
Jan (janneke) Nieuwenhuizen	03fefbf816	lib: linux: Add wait4. * lib/linux/waitpid.c (waitpid): Factor-out wait4 call to... * lib/linux/wait4.c: ...new file here. * include/sys/wait.h (wait4): Add prototype. Include sys/resource.h. * include/sys/resource.h (struct rusage): Remove gratuitous "int" for M2-Planet. * build-aux/configure-lib.sh (libc_SOURCES): Add it. * kaem.run, simple.make (M2_SOURCES), simple.sh: Likewise. Also add resource.h.	2022-05-04 15:56:07 +02:00
Jan (janneke) Nieuwenhuizen	e3085fd899	lib: linux/time: Remove SYS_time specialization. * lib/linux/time.c (time)[SYS_time]: Remove specialization. [!SYS_time && !SYS_gettimeofday]: Remove fallback.	2022-05-04 14:14:51 +02:00
Jan (janneke) Nieuwenhuizen	ccac40e503	kaem: Add kaem.arm and kaem.x86. * kaem.arm, kaem.x86: New files.	2022-05-03 23:35:41 +02:00
Jan (janneke) Nieuwenhuizen	11d024e097	kaem.run: Remove --bootstrap-mode. * include/linux/arm/syscall.h, include/linux/x86/syscall.h, include/mes/constants.h: Remove CONSTANTs. * include/sys/types.h (EOF): Change to 0xffffffff, reps. 0xffffffffffffffff for M2-Planet. * lib/m2/open.c: Move to... * lib/linux/open.c: ...here. Update to make gcc-compatible. * scaffold/argv.kaem: Update accordingly. * lib/linux/lseek.c (_leek, lseek): Suport M2-Planet. * lib/linux/_open3.c (_open3): Fix cast. * lib/linux/waitpid.c (waitpid): Suport M2-Planet. * lib/m2/getcwd.c (PATH_MAX): Remove CONSTANT. * lib/m2/isatty.c (TCGETS): Remove CONSTANT. * lib/mes/ntoab.c: Support M2-Planet. * lib/posix/getcwd.c (__getcwd_buf): Remove. * lib/posix/getenv.c (M2_PTR_SIZE)[__M2__]: Update to #define. * lib/posix/setenv.c: Likewise. * lib/stub/__raise.c (SIGABRT): Remove CONSTANT. * src/core.c (error): Use __M2__ instead of __M2_PLANET__. * src/gc.c (M2_CELL_SIZE)[__M2__]: Update to #define. Support non-bootstrap-mode. * src/posix.c: Likewise. * src/symbol.c: Likewise. * src/vector.c: Likewise. * kaem.run: Remove --botstrap-mode. Update source list accordingly. * simple.make (M2_PLANET_FLAGS): Remove --bootstrap-mode. * simple.make (M2_SOURCES, M2_PLANET_INCLUDES): Update source list accordingly.	2022-05-03 14:45:55 +02:00
Jan (janneke) Nieuwenhuizen	00a6a13ec7	lib: posix/open: Support M2-Planet. * lib/posix/open.c (open)[__M2__]: New function.	2022-05-03 18:05:38 +02:00
Jan (janneke) Nieuwenhuizen	cf6fc2650d	lib: linux/_open3: Support M2-Planet. * lib/linux/_open3.c (_open3): Use function casting. Also call __ungetc_init. * lib/stub/__buffered_read.c: New file.	2022-05-03 18:03:49 +02:00
Jan (janneke) Nieuwenhuizen	e5c34953e0	kaem: read: Remove --bootstrap-mode. * include/mes/lib.h[__M2__](__call_at_exit,abtod,dtoab,ultoa, * include/sys/types.h[__M2__]: Fall back to unsigned instead of using unsigned long. * include/stdio.h[__M2__](fprintf, fscanf, printf, snprintf, sprintf, sscanf): Hide prototypes. * lib/stdlib/exit.c (exit)[__M2__]: Hide call to __call_at_exit. * lib/linux/read.c (read)[__M2__]: Hide debugging. * lib/linux/malloc.c (malloc)[__M2__]: Hide alignment. __mesabi_umod, __mesabi_udiv, __mesabi_uldiv): Hide prototypes. * scaffold/argv.kaem: Use them together with lib/mes/lib-mini.h instead of lib/mes/* specializations. Remove --bootstrap-mode from M2-Planet call.	2022-05-03 12:54:22 +02:00
Jan (janneke) Nieuwenhuizen	a3645b58d0	kaem: argv: Remove --bootstrap-mode. * scaffold/argv.kaem: Use lib/mes/lib-mini.h instead of lib/m2/lib.h. Remove --bootstrap-mode from M2-Planet call.	2022-05-03 12:53:35 +02:00
Jan (janneke) Nieuwenhuizen	a22fa48faa	kaem: hello: Remove --bootstrap-mode. * include/mes/lib-mini.h: Remove M2 bootstrap constants. [__M2__](size_t): Fall-back to unsigned instead of unsigned long. * scaffold/hello.kaem: Use it instead of lib/m2/lib.h. Remove --bootstrap-mode from M2-Planet call.	2022-05-03 12:44:00 +02:00
Jan (janneke) Nieuwenhuizen	ff75d79ef6	kaem: main: Remove --bootstrap-mode. * scaffold/main.kaem: Remove --bootstrap-mode from M2-Planet call.	2022-05-03 12:41:59 +02:00
Jan (janneke) Nieuwenhuizen	627b3089c9	simple.sh: Resurrect. * simple.sh: Add src/globals.c, lib/stub/__raise.c. Use lib/linux/malloc.c instead of lib/stdlib/malloc.c.	2022-05-03 23:06:41 +02:00
Jan (janneke) Nieuwenhuizen	eefc0326ed	simple.make: Resurrect. * simple.make (M2_PLANET_FLAGS): Add --bootstrap-mode. (M2_SOURCES): Use lib/mes/mini-write.c instead of lib/mes/write.c	2022-05-03 22:51:21 +02:00
Jan (janneke) Nieuwenhuizen	4988839b27	lib: linux/read: Fix compile warnings. * lib/linux/read.c (read): Cast filedes, buffer to long.	2022-05-03 23:05:47 +02:00
Jan (janneke) Nieuwenhuizen	daf6a016fd	lib: mes/write: Rename from mes/mini-write.c * lib/mes/mini-write.c: Move to... * lib/mes/write.c: ...here. * build-aux/configure-lib.sh, kaem.run, scaffold/argv.kaem, scaffold/global-array.kaem, scaffold/hello.kaem, scaffold/local-array.kaem, scaffold/local-static-array.kaem, scaffold/read.kaem, simple.make, simple.sh: Update accordingly.	2022-05-03 22:40:47 +02:00
Jan (janneke) Nieuwenhuizen	eae64ef43b	build: Cater for colliding basename in C sources. This is a follow-up to commit `f785f8d560` build: Fix --with-bootstrap build. * build-aux/cc.sh: Retain directory name in object file name. * build-aux/bootstrap.sh.in: Likewise. Compile crt1.c from local directory. * build-aux/build-lib.sh: Likewise. * build-aux/build.sh.in: Remove globals.o hack.	2022-05-21 15:10:46 +02:00
Jan (janneke) Nieuwenhuizen	2fec4f0e8e	guix: m2-planet: Update to 1.10.0. * guix/git/mes.scm (m2-planet): Update to 1.10.0.	2022-05-03 09:24:23 +02:00
Gabriel Wicki	28705c96bd	core: Simplify math expressions. * src/gc.c (gc_up_arena): Use division instead of shift. (gc_flip): Simplify (free-news) * 1.5.	2022-05-10 22:23:40 +02:00
Ekaitz	decc72a4f8	doc: Fix typos. * doc/mes.texi (Invoking mescc): Fix typo. * module/mescc.scm (parse-opts): Likewise.	2022-09-22 11:14:34 +02:00
Ekaitz	6e1ed36c51	mescc: Add X86_64 assembly defines for TinyCC compilation. * lib/x86_64-mes/x86_64.M1 ( mov____%si,(%rdi), mov____%sil,(%rdi), mov____(%rax),%si, mov____(%rax),%sil): New defines.	2022-09-21 09:43:43 +02:00
Jan (janneke) Nieuwenhuizen	0b6dd7edb6	build: When courageous, do build libgetopt and libtcc1. * build-aux/build-lib.sh: Move building of libc+gnu and courageous exit down.	2022-10-18 07:34:27 +02:00
Jan (janneke) Nieuwenhuizen	e99775d060	build: Support bootstrap build without kaem/M2-Planet. * configure.sh (M2_PLANET): Typo. Allow check to fail. (KAEM): Allow check to fail.	2022-10-17 13:10:48 +02:00
Jan (janneke) Nieuwenhuizen	3fd5df98a1	guix: mes: Update to 0.24.1. * guix/git/mes.scm (mes)[source]: Update to 0.24.1.	2022-10-16 10:14:43 +02:00