Revert "squash! DRAFT lib: stdint: Remove __SIZEOF_LONG_LONG__ guard."

This reverts commit e1f729b2bad791c56b16e386fe71706a6d0d1ee9.
squash! syscall <arch>
2022-10-29 20:43:56 +02:00 · 2022-10-29 20:43:56 +02:00 · 2022-10-29 20:43:56 +02:00 · 2022-10-29 20:43:56 +02:00 · 2022-10-29 20:43:56 +02:00 · 2022-10-29 20:43:56 +02:00
123 changed files with 1362 additions and 994 deletions
--- a/8
+++ b/8
@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/32
+++ b/32
@ -130,30 +130,30 @@ x/s *((char **)($rsp+8))

 ** C parser/compiler
 *** [[https://savannah.gnu.org/projects/nyacc][nyacc]]
-*** PEG: [[https://piumarta.com/software/peg/][parse C using PEG]]
+*** PEG: [[http://piumarta.com/software/peg/][parse C using PEG]]
 *** [[https://en.wikipedia.org/wiki/Tiny_C_Compiler][Tiny C Compiler]]
-*** [[https://www.t3x.org/subc/index.html][Sub C]]
+*** [[http://www.t3x.org/subc/index.html][Sub C]]
 *** [[https://groups.google.com/forum/#!topic/comp.lang.lisp/VPuX0VsjTTE][C intepreter in LISP/Scheme/Python]]

 ** C assembler/linker
-*** [[https://www.tldp.org/HOWTO/Assembly-HOWTO/linux.html][Assembly HOWTO]]
+*** [[http://www.tldp.org/HOWTO/Assembly-HOWTO/linux.html][Assembly HOWTO]]
 *** ELF
 7f 45 4c 46
-*** [[https://www.muppetlabs.com/~breadbox/software/tiny/][Small ELF programs]]
-*** [[https://www.cirosantilli.com/elf-hello-world/][Elf hello world]]
+*** [[http://www.muppetlabs.com/~breadbox/software/tiny/][Small ELF programs]]
+*** [[http://www.cirosantilli.com/elf-hello-world/][Elf hello world]]
 ** SC - c as s-expressions
-sc: https://sph.mn/content/3d3
+sc: http://sph.mn/content/3d3
 ** RNRS
-*** [[https://www.scheme-reports.org/][Scheme Reports]]
+*** [[http://www.scheme-reports.org/][Scheme Reports]]
 *** [[ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-349.pdf][Scheme - Report on Scheme]]
 *** [[ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-452.pdf][RRS - Revised Report on Scheme]]

 ** tiny schemes
-https://forum.osdev.org/viewtopic.php?f=15&t=19937
+http://forum.osdev.org/viewtopic.php?f=15&t=19937

-https://www.stripedgazelle.org/joey/dreamos.html
-https://armpit.sourceforge.net/
-https://common-lisp.net/project/movitz/movitz.html
+http://www.stripedgazelle.org/joey/dreamos.html
+http://armpit.sourceforge.net/
+http://common-lisp.net/project/movitz/movitz.html

 <civodul> janneke: https://github.com/namin/inc looks interesting  [15:18]
 ** Orians Jeremiah
@ -170,13 +170,13 @@ https://common-lisp.net/project/movitz/movitz.html
 <janneke> OriansJ: i looked a few times and saw 'LISP empty', so thanks for
          the pointer!  [00:24]
 <civodul> OriansJ, janneke: from that page, there's also:
-          https://web.archive.org/web/20160604035203fw_/https://homepage.ntlworld.com/edmund.grimley-evans/bcompiler.html
+          https://web.archive.org/web/20160604035203fw_/http://homepage.ntlworld.com/edmund.grimley-evans/bcompiler.html

 ** C4/C500
-https://web.archive.org/web/20160604041431/https://homepage.ntlworld.com/edmund.grimley-evans/cc500/cc500.c
+https://web.archive.org/web/20160604041431/http://homepage.ntlworld.com/edmund.grimley-evans/cc500/cc500.c
 https://github.com/rswier/c4/blob/master/c4.c
 ** Compilers for free
-https://codon.com/compilers-for-free
+http://codon.com/compilers-for-free
 ** Small lisps
 *** [[https://www.mirrorservice.org/sites/www.bitsavers.org/bits/TI/Explorer/zeta-c/][ZETA-C]]
 ** Small C compilers
@ -188,10 +188,10 @@ simple as possible.
 *** pcc
 *** early GCC?
 https://miyuki.github.io/2017/10/04/gcc-archaeology-1.html
-*** [[https://tack.sourceforge.net/][ack]]
+*** [[http://tack.sourceforge.net/][ack]]
 <rain1> it may be possible to compile like this:  mes |> ack |> pcc |> tcc |>
        gcc 4.7.4 |> gcc later version... up to modern
-*** [[https://web.archive.org/web/20160402225843/https://homepage.ntlworld.com/edmund.grimley-evans/cc500/][cc500]]
+*** [[https://web.archive.org/web/20160402225843/http://homepage.ntlworld.com/edmund.grimley-evans/cc500/][cc500]]
 ** rain1's Bootstrapping Wiki: https://bootstrapping.miraheze.org/wiki/Main_Page
 ** rain1's hex86
 https://notabug.org/rain1/hex86/src/master/tests/hex0b3.hex86
--- 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/6
+++ b/6
@ -7,7 +7,7 @@
 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
 [[https://guix.gnu.org/blog/2020/guix-further-reduces-bootstrap-seed-to-25][Further Reduced Binary Seed bootstrap]] of [[https://www.gnu.org/software/guix][GNU Guix]].  The final goal is to
-help create a full-source bootstrap as part of the [[https://bootstrappable.org][bootstrappable builds]]
+help create a full-source bootstrap as part of the [[http://bootstrappable.org][bootstrappable builds]]
 effort for UNIX-like operating systems.

 The Scheme interpreter is written in ~5,000 LOC of simple C, and the C
@ -25,7 +25,7 @@ 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: [[https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf][LISP-1.5]] -- John
+Mes is inspired by The Maxwell Equations of Software: [[http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf][LISP-1.5]] -- John
 McCarthy page 13, GNU Guix's source/binary packaging transparency and
 Jeremiah Orians's [[https://github.com/oriansj/stage0][stage0]] ~500 byte self-hosting hex assembler.

@ -76,7 +76,7 @@ General Public Licence version 3 or later.  See the file [[file:COPYING][COPYING
  [7] https://www.cs.indiana.edu/chezscheme/syntax-case/old-psyntax.html
  [8] https://www.nongnu.org/nyacc
  [9] https://gitlab.com/janneke/tinycc
-  [10] [[https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf]]
+  [10] [[http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf]]
  [11] https://savannah.nongnu.org/projects/stage0
  [12] https://nlnet.nl/project/GNUMes
  [13] https://nlnet.nl/project/GNUMes-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.
 #
@ -85,26 +85,17 @@ PHONY_TARGETS:=\

 .PHONY: $(PHONY_TARGETS)

-X86_ARCH_HEADERS = $(wildcard $(scrdest)include/linux/x86/*.h)
-ARCH_HEADERS = $(X86_ARCH_HEADERS:$(srcdest)include/linux/x86/%=include/arch/%)
-
 default: all

 all: doc

 doc: build

-build: | $(ARCH_HEADERS)
+build:
 	$(SHELL) build.sh

 src/${program_prefix}mes: build

-include/arch/%.h: $(srcdest)include/$(mes_kernel)/$(mes_cpu)/%.h | arch-dir
-	cp -f $< $@
-
-arch-dir:
-	mkdir -p include/arch
-
 clean:
 	rm -f *.o *.s bin/mes bin/mes-gcc bin/mes-mescc
 	rm -f mes.{aux,cp,cps,fn,info,log,tmp,toc,vr,vrs}
@ -357,7 +348,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/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@ -201,6 +201,7 @@ lib/tests/setjmp/80-setjmp.c
 lib/tests/stdio/80-sscanf.c
 lib/tests/stdlib/80-qsort.c
 lib/tests/stdlib/80-qsort-dupes.c
+lib/tests/stdlib/80-qsort-stress.c
 lib/tests/string/80-strncpy.c
 lib/tests/string/80-strrchr.c
 lib/tests/scaffold/82-define.c
@ -215,6 +216,7 @@ lib/tests/io/90-stat.c
 lib/tests/mes/90-abtod.c
 lib/tests/mes/90-dtoab.c
 lib/tests/posix/90-execlp.c
+lib/tests/posix/90-mmap.c
 lib/tests/posix/90-unsetenv.c
 lib/tests/signal/90-signal.c
 lib/tests/stdio/90-fopen.c
@ -222,6 +224,7 @@ lib/tests/stdio/90-fopen-append.c
 lib/tests/stdio/90-fread-fwrite.c
 lib/tests/stdio/90-fseek.c
 lib/tests/stdio/90-sprintf.c
+lib/tests/stdio/90-sscanf.c
 lib/tests/stdlib/90-strtol.c
 lib/tests/string/90-snprintf.c
 lib/tests/string/90-strpbrk.c
@ -290,6 +293,7 @@ lib/tests/scaffold/70-extern.c
 lib/tests/stdio/80-sscanf.c
 lib/tests/posix/90-execlp.c
 lib/tests/string/90-snprintf.c
+lib/tests/stdio/90-sscanf.c
 "
    fi
 fi
--- 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
@ -249,6 +250,7 @@ lib/stdio/fclose.c
 lib/stdio/fdopen.c
 lib/stdio/ferror.c
 lib/stdio/fflush.c
+lib/stdio/fileno.c
 lib/stdio/fopen.c
 lib/stdio/fprintf.c
 lib/stdio/fread.c
@ -319,9 +321,11 @@ lib/dirent/__getdirentries.c
 lib/dirent/closedir.c
 lib/dirent/opendir.c
 lib/dirent/readdir.c
+lib/locale/localeconv.c
 lib/math/ceil.c
 lib/math/fabs.c
 lib/math/floor.c
+lib/math/labs.c
 lib/mes/fdgets.c
 lib/posix/alarm.c
 lib/posix/execl.c
@ -333,10 +337,10 @@ lib/posix/unsetenv.c
 lib/stdio/clearerr.c
 lib/stdio/feof.c
 lib/stdio/fgets.c
-lib/stdio/fileno.c
 lib/stdio/freopen.c
 lib/stdio/fscanf.c
 lib/stdio/perror.c
+lib/stdio/rewind.c
 lib/stdio/vfscanf.c
 lib/stdlib/__exit.c
 lib/stdlib/abort.c
@ -357,7 +361,9 @@ lib/string/strerror.c
 lib/string/strncat.c
 lib/string/strpbrk.c
 lib/string/strspn.c
+lib/string/strtok.c
 lib/stub/__cleanup.c
+lib/stub/asctime.c
 lib/stub/atan2.c
 lib/stub/bsearch.c
 lib/stub/chown.c
@ -370,6 +376,7 @@ lib/stub/frexp.c
 lib/stub/getgrgid.c
 lib/stub/getgrnam.c
 lib/stub/getlogin.c
+lib/stub/getpagesize.c
 lib/stub/getpgid.c
 lib/stub/getpgrp.c
 lib/stub/getpwnam.c
@ -382,7 +389,6 @@ lib/stub/pclose.c
 lib/stub/popen.c
 lib/stub/pow.c
 lib/stub/rand.c
-lib/stub/rewind.c
 lib/stub/setbuf.c
 lib/stub/setgrent.c
 lib/stub/setlocale.c
@ -394,7 +400,9 @@ lib/stub/sigsetmask.c
 lib/stub/sin.c
 lib/stub/sqrt.c
 lib/stub/strftime.c
+lib/stub/strsignal.c
 lib/stub/sys_siglist.c
+lib/stub/sysconf.c
 lib/stub/system.c
 lib/stub/times.c
 lib/stub/ttyname.c
@ -419,12 +427,14 @@ lib/linux/link.c
 lib/linux/lstat.c
 lib/linux/mkdir.c
 lib/linux/mknod.c
+lib/linux/mmap.c
+lib/linux/munmap.c
 lib/linux/nanosleep.c
 lib/linux/pipe.c
 lib/linux/readlink.c
 lib/linux/rename.c
 lib/linux/setgid.c
-lib/linux/settimer.c
+lib/linux/setitimer.c
 lib/linux/setuid.c
 lib/linux/signal.c
 lib/linux/sigprogmask.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/doc/fdl-1.3.texi
+++ b/doc/fdl-1.3.texi
@ -6,7 +6,7 @@

@display
 Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-@uref{https://fsf.org/}
+@uref{http://fsf.org/}

 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
@ -414,7 +414,7 @@ The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-@uref{https://www.gnu.org/copyleft/}.
+@uref{http://www.gnu.org/copyleft/}.

 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
--- a/doc/mes.texi
+++ b/doc/mes.texi
@ -204,7 +204,7 @@ Freedom 1.
@section Reproducible Builds

 The current Reproducible Builds effort incubated in the Debian
-project@footnote{@url{https://debian.org, The Debian Project}} and was
+project@footnote{@url{http://debian.org, The Debian Project}} and was
 organized by Lunar.  Quoting the Reproducible Builds
 website@footnote{@url{https://reproducible-builds.org/,Reproducible
 Builds}}
@ -365,7 +365,7 @@ Most computers work pretty well so apparently there is not a pressing
 need to inspect and study all of these codes.  At the same time it is
 tricky to fully trust@footnote{ Ken Thompson's 1984 Turing award
 acceptance speech
-@url{https://www.ece.cmu.edu/~ganger/712.fall02/papers/p761-thompson.pdf,
+@url{http://www.ece.cmu.edu/~ganger/712.fall02/papers/p761-thompson.pdf,
 Reflections on Trusting Tust}.} a computer that was bootstrapped in this
 way.

@ -461,7 +461,7 @@ and mescc-tools can be removed.
 As fate would have it, I stumbled upon this
@url{https://queue.acm.org/detail.cfm?id=1039523, interview with Alan
 Kay}, where he shares a revelation he had when reading John McCarthy's
-@url{https://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf,
+@url{http://www.softwarepreservation.org/projects/LISP/book/LISP%201.5%20Programmers%20Manual.pdf,
 LISP-1.5} manual:

@quotation
@ -553,11 +553,11 @@ in the Mes source tree for additional details.
 GNU Mes depends on the following packages:

@itemize
-@item @url{https://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or
+@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or
 later, including 2.2.x and 3.0.x,
-@item @url{https://www.gnu.org/software/make/, GNU Make}.
+@item @url{http://www.gnu.org/software/make/, GNU Make}.
@item @url{https://savannah.gnu.org/projects/nyacc/, NYACC}, version 1.00.2,
-@item @url{https://gcc.gnu.org, GCC's gcc}, version 2.95.3 or later, including 10.2.0,
+@item @url{http://gcc.gnu.org, GCC's gcc}, version 2.95.3 or later, including 10.2.0,
@item @url{https://savannah.gnu.org/projects/mescc-tools/, mescc-tools}, version 1.4.0,
@end itemize

@ -693,7 +693,7 @@ responsibility.
 The Reduced Binary Seed bootstrap currently adopted by Guix@footnote{See
@file{gnu/packages/commencement.scm} in the @var{master} branch in Guix
 git
-@url{https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/commencement.scm}}.
+@url{http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/commencement.scm}}.
 In its intiial form it is only available for x86-linux and armhf-linux.

 Currently, it goes like this:
@ -1155,8 +1155,8 @@ Porting MesCC:
 The Perfect Setup to hack on Mes is basically the perfect setup used
 for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference
 Manual}).  First, you need more than an editor, you need
-@url{https://www.gnu.org/software/emacs, Emacs}, empowered by the
-wonderful @url{https://nongnu.org/geiser/, Geiser}.
+@url{http://www.gnu.org/software/emacs, Emacs}, empowered by the
+wonderful @url{http://nongnu.org/geiser/, Geiser}.

 Geiser allows for interactive and incremental development from within
 Emacs: code compilation and evaluation from within buffers, access to
@ -1181,7 +1181,7 @@ Scheme code in Mes is written in a purely functional style.
@cindex coding style
 When writing Scheme code, we follow common wisdom among Scheme
 programmers.  In general, we follow the
-@url{https://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp
+@url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp
 Style Rules}.  This document happens to describe the conventions mostly
 used in Guile’s code too.  It is very thoughtful and well written, so
 please do read it.
--- 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/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/float.h
+++ b/include/float.h
@ -29,6 +29,19 @@
 #define DBL_MIN_EXP -1021
 #define LDBL_MIN_EXP -1021

+// gcc-4.6
+#define DBL_EPSILON 1
+#define DBL_MANT_DIG 1
+#define DBL_MAX INT_MAX
+#define DBL_MIN INT_MIN
+
+#define FLT_RADIX 10
+
+#define LDBL_EPSILON 1
+#define LDBL_MANT_DIG 1
+#define LDBL_MAX INT_MAX
+#define LDBL_MIN INT_MIN
+
 #endif // ! SYSTEM_LIBC

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

 #define MB_CUR_MAX 1
 #define NAME_MAX 255
+#define PAGE_SIZE 4096
 #define PATH_MAX 512
 #define _POSIX_OPEN_MAX 16

--- a/include/linux/arm/kernel-stat.h
+++ b/include/linux/arm/kernel-stat.h
@ -24,8 +24,6 @@

 #include <arch/syscall.h>

-#if __SIZEOF_LONG_LONG__ != 8
-
 // *INDENT-OFF*
 struct stat
 {
@ -48,10 +46,8 @@ struct stat
  unsigned long  __pad0;
  unsigned long  __pad1;
 };
-
-#else // __SIZEOF_LONG_LONG__ == 8
-
-struct stat
+#if __SIZEOF_LONG_LONG__ == 8
+struct stat64
 {
  unsigned long long st_dev;
  unsigned char __pad0[4];
@ -74,6 +70,14 @@ struct stat
  unsigned long long st_ino;
 };

-#endif // __SIZEOF_LONG_LONG__ == 8
+#define stat stat64
+#undef SYS_stat
+#define SYS_stat SYS_stat64
+#undef SYS_lstat
+#define SYS_lstat SYS_lstat64
+#undef SYS_fstat
+#define SYS_fstat SYS_fstat64
+
+#endif // HAVE_LONG_LONG

 #endif // __MES_LINUX_ARM_KERNEL_STAT_H
--- 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 */
@ -73,6 +55,7 @@
 #define SYS_lseek  0x13
 #define SYS_rmdir  0x28
 #define SYS_stat   0x6a
+#define SYS_stat64 0xc3

 /* libc+gnu */
 #define SYS_chdir     0x0c
@ -89,8 +72,10 @@
 #define SYS_fcntl     0x37
 #define SYS_getrusage 0x4d
 #define SYS_lstat     0x6b
+#define SYS_lstat64   0xc4
 #define SYS_setitimer 0x68
 #define SYS_fstat     0x6c
+#define SYS_fstat64   0xc5
 #define SYS_nanosleep 0xa2
 #define SYS_getdents  0x8d

@ -109,23 +94,8 @@
 #define SYS_readlink  0x55
 #define SYS_mknod     0x0e

-#if __SIZEOF_LONG_LONG__ == 8
-
-#define SYS_stat64     0xc3
-#define SYS_lstat64    0xc4
-#define SYS_fstat64    0xc5
-#define SYS_fcntl64    0xdd
-#define SYS_getdents64 0xdc
-
-#undef SYS_stat
-#define SYS_stat SYS_stat64
-
-#undef SYS_lstat
-#define SYS_lstat SYS_lstat64
-
-#undef SYS_fstat
-#define SYS_fstat SYS_fstat64
-
-#endif  // __SIZEOF_LONG_LONG__ == 8
+// gcc-4.6.4
+#define SYS_mmap      0x5a
+#define SYS_munmap    0x5b

 #endif /* __MES_LINUX_ARM_SYSCALL_H */
--- 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/kernel-stat.h
+++ b/include/linux/x86/kernel-stat.h
@ -24,8 +24,6 @@

 #include <arch/syscall.h>

-#if __SIZEOF_LONG_LONG__ != 8
-
 // *INDENT-OFF*
 struct stat
 {
@ -48,10 +46,8 @@ struct stat
  unsigned long  __pad0;
  unsigned long  __pad1;
 };
-
-#else // __SIZEOF_LONG_LONG__ == 8
-
-struct stat
+#if __SIZEOF_LONG_LONG__ == 8
+struct stat64
 {
  unsigned long long st_dev;
  unsigned char __pad0[4];
@ -74,6 +70,14 @@ struct stat
  unsigned long long st_ino;
 };

-#endif // __SIZEOF_LONG_LONG__ == 8
+#define stat stat64
+#undef SYS_stat
+#define SYS_stat SYS_stat64
+#undef SYS_lstat
+#define SYS_lstat SYS_lstat64
+#undef SYS_fstat
+#define SYS_fstat SYS_fstat64
+
+#endif // HAVE_LONG_LONG

 #endif // __MES_LINUX_X86_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 */
@ -73,6 +53,7 @@
 #define SYS_lseek  0x13
 #define SYS_rmdir  0x28
 #define SYS_stat   0x6a
+#define SYS_stat64 0xc3

 /* libc+gnu */
 #define SYS_chdir     0x0c
@ -91,8 +72,10 @@
 #define SYS_fcntl     0x37
 #define SYS_getrusage 0x4d
 #define SYS_lstat     0x6b
+#define SYS_lstat64   0xc4
 #define SYS_setitimer 0x68
 #define SYS_fstat     0x6c
+#define SYS_fstat64   0xc5
 #define SYS_nanosleep 0xa2
 #define SYS_getdents  0x8d

@ -111,23 +94,8 @@
 #define SYS_readlink  0x55
 #define SYS_mknod     0x0e

-#if __SIZEOF_LONG_LONG__ == 8
-
-#define SYS_stat64     0xc3
-#define SYS_lstat64    0xc4
-#define SYS_fstat64    0xc5
-#define SYS_fcntl64    0xdd
-#define SYS_getdents64 0xdc
-
-#undef SYS_stat
-#define SYS_stat SYS_stat64
-
-#undef SYS_lstat
-#define SYS_lstat SYS_lstat64
-
-#undef SYS_fstat
-#define SYS_fstat SYS_fstat64
-
-#endif  // __SIZEOF_LONG_LONG__ == 8
+// gcc-4.6.4
+#define SYS_mmap      0x5a
+#define SYS_munmap    0x5b

 #endif /* __MES_LINUX_X86_SYSCALL_H */
--- a/include/linux/x86_64/syscall.h
+++ b/include/linux/x86_64/syscall.h
@ -85,4 +85,8 @@
 #define SYS_readlink  0x59
 #define SYS_mknod     0x85

+// gcc-4.6.4
+#define SYS_mmap      0x09
+#define SYS_munmap    0x0b
+
 #endif // __MES_LINUX_X86_64_SYSCALL_H
--- a/include/locale.h
+++ b/include/locale.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -38,6 +38,30 @@
 #endif
 // *INDENT-ON*

+struct lconv
+{
+  char *decimal_point;
+  char *thousands_sep;
+  char *grouping;
+
+  char *int_curr_symbol;
+  char *currency_symbol;
+  char *mon_decimal_point;
+  char *mon_thousands_sep;
+  char *mon_grouping;
+  char *positive_sign;
+  char *negative_sign;
+  char int_frac_digits;
+  char frac_digits;
+  char p_cs_precedes;
+  char p_sep_by_space;
+  char n_cs_precedes;
+  char n_sep_by_space;
+  char p_sign_posn;
+  char n_sign_posn;
+};
+
+struct lconv * localeconv (void);
 char *setlocale (int category, char const *locale);

 #endif // ! SYSTEM_LIBC
--- 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/math.h
+++ b/include/math.h
@ -31,6 +31,7 @@ double cos (double x);
 double exp (double x);
 double fabs (double number);
 double floor (double x);
+long int labs (long int number);
 double ldexp (double value, int exponent);
 double log (double x);
 double modf (double value, double *integer_part);
--- 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,10 +61,12 @@ 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,
@ -75,16 +77,15 @@ 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/stdint.h
+++ b/include/stdint.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2020,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 * Copyright © 2018 Peter De Wachter <pdewacht@gmail.com>
 *
 * This file is part of GNU Mes.
@ -55,10 +55,8 @@ typedef unsigned short uint16_t;
 typedef short int16_t;
 typedef unsigned uint32_t;
 typedef int int32_t;
-#if __SIZEOF_LONG_LONG__ == 8
 typedef unsigned long long uint64_t;
 typedef long long int64_t;
-#endif // __SIZEOF_LONG_LONG__ == 8

 typedef int intmax_t;
 typedef unsigned uintmax_t;
@ -87,6 +85,12 @@ typedef unsigned uintmax_t;

 #define INT_MIN -2147483648
 #define INT_MAX 2147483647
+
+#define SHRT_MAX INT16_MAX
+#define SHRT_MIN INT16_MIN
+#define USHRT_MAX UINT16_MAX
+#define USHRT_MIN UINT16_MIN
+
 #if __i386__ || __arm__
 #define LONG_MIN INT_MIN
 #define LONG_MAX INT_MAX
@ -105,6 +109,8 @@ typedef unsigned uintmax_t;
 #define SIZE_MAX UINT64_MAX
 #endif

+#define SSIZE_MAX LONG_MAX
+
 #endif // ! SYSTEM_LIBC

 #endif // __MES_STDINT_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,35 @@ 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 fileno (FILE *);
 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);
+void rewind (FILE * stream);
 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/string.h
+++ b/include/string.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.
 *
@ -47,7 +47,9 @@ size_t strlen (char const *);
 char *strncpy (char *to, char const *from, size_t size);
 int strncmp (char const *, char const *, size_t);
 char *strrchr (char const *s, int c);
+char *strsignal (int signum);
 char *strstr (char const *haystack, char const *needle);
+char *strtok (char *new_string, char const *delimiters);
 char *strlwr (char *string);
 char *strupr (char *string);

--- 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/mman.h
+++ b/include/sys/mman.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,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -25,19 +25,25 @@
 #include_next <sys/mman.h>
 #else // ! SYSTEM_LIBC

-#ifndef __MES_SIZE_T
-#define __MES_SIZE_T
-typedef unsigned long size_t;
-#endif
+#include <sys/types.h>
+
+#define MAP_SHARED    0x01
+#define MAP_PRIVATE   0x02
+#define MAP_ANONYMOUS 0x20
+#define MAP_POPULATE  0x08000
+
+#define MAP_ANON MAP_ANONYMOUS
+#define MAP_FAILED ((void*)-1)

 #define PROT_NONE 0
 #define PROT_READ 1
 #define PROT_WRITE 2
 #define PROT_EXEC 4

+void *mmap (void *address, size_t length, int protect, int flags, int filedes, off_t offset);
 int mprotect (void *addr, size_t len, int prot);
+int munmap (void *addr, size_t length);

 #endif // ! SYSTEM_LIBC

 #endif // __MES_SYS_MMAN_H
-
--- 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
@ -56,6 +56,7 @@ struct timespec
 #endif // __MES_STRUCT_TIMESPEC

 #define CLOCK_PROCESS_CPUTIME_ID 2
+char *asctime (struct tm const *broken_time);
 int clock_gettime (clockid_t clk_id, struct timespec *tp);
 struct tm *localtime (time_t const *timep);
 struct tm *gmtime (time_t const *time);
--- a/include/unistd.h
+++ b/include/unistd.h
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -74,6 +74,7 @@ int setgid (gid_t newgid);
 int setuid (uid_t newuid);
 uid_t geteuid (void);
 gid_t getegid (void);
+int getpagesize (void);
 pid_t getpgrp (void);
 pid_t getpid (void);
 pid_t getppid (void);
@ -90,6 +91,7 @@ char *sbrk (ptrdiff_t delta);
 void *sbrk (intptr_t delta);
 #endif
 int symlink (char const *old_name, char const *new_name);
+long sysconf (int name);
 int unlink (char const *file_name);
 ssize_t write (int filedes, void const *buffer, size_t size);

--- 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/dirent/readdir.c
+++ b/lib/dirent/readdir.c
@ -39,7 +39,7 @@ struct dirent *
 readdir (DIR * dirp)
 {
  struct dirent *dp;
-  int saved_errno = errno;
+  int save_errno = errno;

  do
    {
@ -64,7 +64,7 @@ readdir (DIR * dirp)
            {
              /* Don't modifiy errno when reaching EOF.  */
              if (bytes == 0)
-                errno = saved_errno;
+                errno = save_errno;
              dp = 0;
              break;
            }
--- 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/arm-mes-gcc/syscall.c
+++ b/lib/linux/arm-mes-gcc/syscall.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.
 *
@ -19,7 +19,7 @@
 */

 #include <errno.h>
-#include <linux/x86/syscall.h>
+#include <linux/arm/syscall.h>

 #if !__TINYC__
 // *INDENT-OFF*
@ -187,7 +187,6 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
 }
 #endif //__TINYC__

-#if 0
 long
 __sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
 {
@ -208,7 +207,6 @@ __sys_call6 (long sys_call, long one, long two, long three, long four, long five
       );
  return r;
 }
-#endif

 // *INDENT-ON*

@ -282,7 +280,6 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
  return r;
 }

-#if 0
 long
 _sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
 {
@ -296,4 +293,3 @@ _sys_call6 (long sys_call, long one, long two, long three, long four, long five,
    errno = 0;
  return r;
 }
-#endif
--- 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/mmap.c
+++ b/lib/linux/mmap.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 © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -20,15 +20,10 @@

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

-int
-open (char *file_name, int flags, int mask)
+void *
+mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
-  int r = _sys_call3 (SYS_open, file_name, flags, mask);
-  if (r > 2)
-    __ungetc_clear (r);
-  return r;
+  return (void *)_sys_call6 (SYS_mmap, (long) addr, (long) len, (int) prot, (int) flags, (int) fd, (long) offset);
 }
--- a/lib/m2/clock_gettime.c
+++ b/lib/m2/clock_gettime.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * 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.
 *
@ -19,12 +19,11 @@
 */

 #include <linux/syscall.h>
-#include <syscall.h>
-#include <time.h>
+#include <arch/syscall.h>
+#include <sys/mman.h>

 int
-clock_gettime (long clk_id, struct timespec *tp)
+munmap (void *addr, size_t length)
 {
-  long long_tp = tp;
-  return _sys_call2 (SYS_clock_gettime, clk_id, tp);
+  return _sys_call2 (SYS_munmap, (long) addr, (long) length);
 }
--- a/lib/linux/open.c
+++ b/lib/linux/open.c
@ -0,0 +1,49 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2016,2017,2018,2019,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/>.
+ */
+
+#include <linux/syscall.h>
+#include <arch/syscall.h>
+#include <mes/lib.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+#if __M2__
+int
+open (char *file_name, int flags, int mask)
+{
+  int r = _sys_call3 (SYS_open, file_name, flags, mask);
+  if (r > 2)
+    __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/setitimer.c
+++ b/lib/linux/setitimer.c
--- 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/linux/x86-mes-gcc/syscall.c
+++ b/lib/linux/x86-mes-gcc/syscall.c
@ -177,3 +177,20 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
    errno = 0;
  return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  long r;
+  asm (
+       "mov    %1,%%eax\n\t"
+       "mov    %%ebp,%%ebx\n\t"
+       "add    $0x0c,%%ebx\n\t"
+       "int    $0x80\n\t"
+       "mov    %%eax,%0\n\t"
+       : "=r" (r)
+       : "rm" (sys_call)
+       : "eax", "ebx"
+       );
+  return r;
+}
--- a/lib/linux/x86-mes-mescc/syscall.c
+++ b/lib/linux/x86-mes-mescc/syscall.c
@ -66,6 +66,15 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
  asm ("int____$0x80");
 }

+long
+__sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  asm ("mov____0x8(%ebp),%eax !0x08");
+  asm ("mov____%ebp,%ebx");
+  asm ("add____$i8,%ebx !0x0c");
+  asm ("int____$0x80");
+}
+
 long
 _sys_call (long sys_call)
 {
@ -135,3 +144,9 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
    errno = 0;
  return r;
 }
+
+int
+_sys_call6 (int sys_call, int one, int two, int three, int four, int five, int six)
+{
+  return __sys_call6 (sys_call, one, two, three, four, five, six);
+}
--- a/lib/linux/x86_64-mes-gcc/syscall.c
+++ b/lib/linux/x86_64-mes-gcc/syscall.c
@ -179,3 +179,26 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
    errno = 0;
  return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  long r;
+  asm (
+       "mov     %2,%%rdi\n\t"
+       "mov     %3,%%rsi\n\t"
+       "mov     %4,%%rdx\n\t"
+       "mov     %5,%%r10\n\t"
+       "mov     %6,%%r8\n\t"
+       "mov     %7,%%r9\n\t"
+       "mov     %1,%%rax\n\t"
+  //      );
+  // asm (
+       "syscall \n\t"
+       "mov     %%rax,%0\n\t"
+       : "=r" (r)
+       : "rm" (sys_call), "rm" (one), "rm" (two), "rm" (three), "rm" (four), "rm" (five), "rm" (six)
+       : "rax", "rdi", "rsi", "rdx", "r10", "r8", "r9"
+       );
+  return r;
+}
--- a/lib/linux/x86_64-mes-mescc/syscall.c
+++ b/lib/linux/x86_64-mes-mescc/syscall.c
@ -96,6 +96,8 @@ __sys_call4 (long sys_call, long one, long two, long three, long four)
  asm ("mov____0x8(%rbp),%rsi !0x20");
  asm ("mov____0x8(%rbp),%rdx !0x28");
  asm ("mov____0x8(%rbp),%r10 !0x30");
+  asm ("mov____0x8(%rbp),%r8  !0x38");
+  asm ("mov____0x8(%rbp),%r9  !0x40");
 #endif

  asm ("syscall");
@ -170,3 +172,12 @@ _sys_call4 (long sys_call, long one, long two, long three, long four)
    errno = 0;
  return r;
 }
+
+long
+_sys_call6 (long sys_call, long one, long two, long three, long four, long five, long six)
+{
+  // long rax = sys_call;
+  // long r = __sys_call6 (one, two, three, four, five, six);
+  long r = __sys_call (sys_call, one, two, three, four, five, six);
+  return r;
+}
--- a/lib/locale/localeconv.c
+++ b/lib/locale/localeconv.c
@ -0,0 +1,51 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * 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/>.
+ */
+
+#include <mes/lib.h>
+#include <locale.h>
+#include <limits.h>
+
+static struct lconv posix_lconv =
+  {
+    ".",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+    CHAR_MAX,
+  };
+
+struct lconv *
+localeconv (void)
+{
+  return (void *)&posix_lconv;
+}
--- 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/time.c
+++ b/lib/m2/time.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.
 *
@ -22,16 +22,13 @@
 #include <arch/syscall.h>
 #include <time.h>

-char *__tv;
-
 long
 time (long* result)
 {
  int r;
-  if (__tv == 0)
-    __tv = malloc (sizeof (struct timeval));
-  struct timeval *tv = __tv;
-  r = _sys_call2 (SYS_gettimeofday, tv, 0);
+  struct timeval tv;
+  struct timezone tz;
+  r = _sys_call2 (SYS_gettimeofday, tv, tz);
  if (r != 0)
    return -1;
  if (result != 0)
--- a/lib/math/labs.c
+++ b/lib/math/labs.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 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,12 +18,12 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <mes/lib.h>
+#include <math.h>

-void _exit (int code);
-
-void
-exit (int code)
+long int
+labs (long int number)
 {
-  _exit (code);
+  if (number < 0)
+    return -number;
+  return number;
 }
--- a/lib/mes/__assert_fail.c
+++ b/lib/mes/__assert_fail.c
@ -25,7 +25,7 @@ void
 __assert_fail (char const *msg, char const *file, unsigned line,
               char const *function)
 {
-  if (file && file[0])
+  if (file && *file)
    {
      eputs (file);
      eputs (":");
@ -35,7 +35,7 @@ __assert_fail (char const *msg, char const *file, unsigned line,
      eputs (itoa (line));
      eputs (":");
    }
-  if (function && function[0])
+  if (function && *function)
    {
      eputs (function);
      eputs (":");
--- 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
@ -20,7 +20,6 @@
 */

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

 void
--- 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/rewind.c
+++ b/lib/stdio/rewind.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,16 +18,10 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <mes/lib.h>
-#include <errno.h>
+#include <stdio.h>

-int
-rewind (int x)
+void
+rewind (FILE * stream)
 {
-  static int stub = 0;
-  if (__mes_debug () && !stub)
-    eputs ("rewind stub\n");
-  stub = 1;
-  errno = 0;
-  return 0;
+  fseek (stream, 0, SEEK_SET);
 }
--- a/lib/stdio/vfprintf.c
+++ b/lib/stdio/vfprintf.c
@ -26,7 +26,7 @@
 int
 vfprintf (FILE * f, char const *format, va_list ap)
 {
-  int fd = (long) f;
+  int fd = fileno (f);
  char const *p = format;
  int count = 0;
  while (*p)
@ -41,6 +41,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
        char c = *p;
        int left_p = 0;
        int precision = -1;
+        int prefix_p = 0;
        int width = -1;
        if (c == '-')
          {
@ -51,12 +52,17 @@ vfprintf (FILE * f, char const *format, va_list ap)
        if (c == ' ')
          {
            pad = c;
-            c = *p++;
+            c = *++p;
+          }
+        if (c == '#')
+          {
+            prefix_p = 1;
+            c = *++p;
          }
        if (c == '0')
          {
            pad = c;
-            c = *p++;
+            c = *++p;
          }
        if (c >= '0' && c <= '9')
          {
@ -134,6 +140,18 @@ vfprintf (FILE * f, char const *format, va_list ap)
                      count++;
                    }
                }
+              if (prefix_p && *s && c == 'o')
+                {
+                  fputc ('0', f);
+                  width--;
+                }
+              if (prefix_p && *s && (c == 'x' || c == 'X'))
+                {
+                  fputc ('0', f);
+                  width--;
+                  fputc ('x', f);
+                  width--;
+                }
              while (*s)
                {
                  if (precision-- <= 0)
@ -194,6 +212,9 @@ vfprintf (FILE * f, char const *format, va_list ap)
          case 'G':
            {
              double d = va_arg8 (ap, double);
+#if 1
+              fputs ("0.0", f);
+#else
              char *s = dtoab (d, 10, 1);
              if (c == 'E' || c == 'G')
                strupr (s);
@ -229,6 +250,7 @@ vfprintf (FILE * f, char const *format, va_list ap)
                  fputc (pad, f);
                  count++;
                }
+#endif
              break;
            }
          case 'n':
@ -241,6 +263,8 @@ vfprintf (FILE * f, char const *format, va_list ap)
            {
              eputs ("vfprintf: not supported: %:");
              eputc (c);
+              eputs (", in format: ");
+              eputs (format);
              eputs ("\n");
              p++;
            }
@ -248,5 +272,5 @@ vfprintf (FILE * f, char const *format, va_list ap)
        p++;
      }
  va_end (ap);
-  return 0;
+  return count;
 }
--- a/lib/stdio/vfscanf.c
+++ b/lib/stdio/vfscanf.c
@ -1,6 +1,7 @@
 /* -*-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>
+ * Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
 *
 * This file is part of GNU Mes.
 *
@ -23,62 +24,81 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>

 int
 vfscanf (FILE * stream, char const *template, va_list ap)
 {
-  char p = fgetc (stream);
+  char r = fgetc (stream);
  char const *t = template;
  int count = 0;
-  while (*t && p != EOF)
+  while (*t && r != EOF)
    if (*t != '%')
      {
        t++;
-        p = fgetc (stream);
+        r = fgetc (stream);
      }
    else
      {
        t++;
        char c = *t;
+        int skip_p = 0;
+        int length = -1;
+        if (c == '*')
+          skip_p = 1;
+        if (c >= '0' && c <= '9')
+          {
+            length = abtol (&t, 10);
+            c = *t;
+          }
        if (c == 'l')
          c = *++t;
        switch (c)
          {
          case '%':
            {
-              p = fgetc (stream);
+              r = fgetc (stream);
              break;
            }
          case 'c':
            {
-              char *c = va_arg (ap, char *);
-              *c = p;
-              p = fgetc (stream);
-              count++;
+              r = fgetc (stream);
+              if (!skip_p)
+                {
+                  char *c = va_arg (ap, char *);
+                  *c = r;
+                  count++;
+                }
              break;
            }
          case 'd':
          case 'i':
          case 'u':
            {
-              int *d = va_arg (ap, int *);
+              int *d = skip_p ? 0 : va_arg (ap, int *);
              char buf[20];
              char *q = buf;
-              if (p == '+' || p == '-')
+              if (r == '+' || r == '-')
                {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                }
-              while (isdigit (p))
+              while (isdigit (r))
                {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                }
-              ungetc (p, stream);
+              ungetc (r, stream);
              *q = 0;
              q = buf;
-              *d = abtol ((char const**)&q, 10);
-              count++;
+              if (skip_p)
+                abtol ((char const **) &q, 10);
+              else
+                {
+                  *d = abtol ((char const **) &q, 10);
+                  count++;
+                }
              break;
            }
          case 'e':
@ -87,33 +107,100 @@ vfscanf (FILE * stream, char const *template, va_list ap)
          case 'E':
          case 'G':
            {
-              float *f = va_arg (ap, float *);
+              float *f = skip_p ? 0 : va_arg (ap, float *);
              char buf[20];
              char *q = buf;
-              if (p == '+' || p == '-')
+              if (r == '+' || r == '-')
                {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                }
-              while (isdigit (p))
+              while (isdigit (r))
                {
-                  *q++ = p;
-                  p = fgetc (stream);
+                  *q++ = r;
+                  r = fgetc (stream);
                }
-              ungetc (p, stream);
+              ungetc (r, stream);
              *q = 0;
              q = buf;
-              *f = strtod (q, &q);
-              count++;
+              if (skip_p)
+                strtod (q, &q);
+              else
+                {
+                  *f = strtod (q, &q);
+                  count++;
+                }
+              break;
+            }
+          case 's':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              while (r && !isspace (r) && (length == -1 || length--))
+                {
+                  if (!skip_p)
+                    *s++ = r;
+                  r = fgetc (stream);
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
+              break;
+            }
+          case '[':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char set[1024];
+              int i = 0;
+              int not_in_set_p = 0;
+              t++;
+              if (*t == '^')
+                {
+                  not_in_set_p = 1;
+                  t++;
+                }
+              if (*t == ']' || *t == '-')
+                set[i++] = *t++;
+              while (*t && *t != ']')
+                {
+                  if (*t == '-')
+                    {
+                      char end = *t++;
+                      for (char x = set[i - 1] + 1; x < end; x++)
+                        set[i++] = x;
+                    }
+                  else
+                    set[i++] = *t++;
+                }
+              set[i] = 0;
+              while (r && (length == -1 || length--))
+                {
+                  int match = (int) (long) strchr (set, r);
+                  if (not_in_set_p)
+                    match = !match;
+                  if (!match)
+                    break;
+                  if (!skip_p)
+                    *s++ = r;
+                  r = fgetc (stream);
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
              break;
            }
          default:
            {
              eputs ("vsscanf: not supported: %:");
              eputc (c);
+              eputs (", in template: ");
+              eputs (template);
              eputs ("\n");
              t++;
-              p = fgetc (stream);
+              r = fgetc (stream);
            }
          }
        t++;
--- a/lib/stdio/vsnprintf.c
+++ b/lib/stdio/vsnprintf.c
@ -43,6 +43,7 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
        c = *p;
        int left_p = 0;
        int precision = -1;
+        int prefix_p = 0;
        int width = -1;
        if (c == '-')
          {
@ -53,12 +54,17 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
        if (c == ' ')
          {
            pad = c;
-            c = *p++;
+            c = *++p;
+          }
+        if (c == '#')
+          {
+            prefix_p = 1;
+            c = *++p;
          }
        if (c == '0')
          {
            pad = c;
-            c = *p++;
+            c = *++p;
          }
        if (c >= '0' && c <= '9')
          {
@ -142,6 +148,18 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
                      count++;
                    }
                }
+              if (prefix_p && *s && c == 'o')
+                {
+                  *s++ = '0';
+                  width--;
+                }
+              if (prefix_p && *s && (c == 'x' || c == 'X'))
+                {
+                  *s++ = '0';
+                  width--;
+                  *s++ = 'x';
+                  width--;
+                }
              while (*s)
                {
                  if (precision-- <= 0)
@ -210,6 +228,11 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
          case 'G':
            {
              double d = va_arg8 (ap, double);
+#if 1
+              *str++ = '0';
+              *str++ = '.';
+              *str++ = '0';
+#else
              char *s = dtoab (d, 10, 1);
              if (c == 'E' || c == 'G')
                strupr (s);
@ -250,6 +273,7 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
                    *str++ = pad;
                  count++;
                }
+#endif
              break;
            }
          case 'n':
@ -262,6 +286,8 @@ vsnprintf (char *str, size_t size, char const *format, va_list ap)
            {
              eputs ("vsnprintf: not supported: %:");
              eputc (c);
+              eputs (", in format: ");
+              eputs (format);
              eputs ("\n");
              p++;
            }
--- a/lib/stdio/vsscanf.c
+++ b/lib/stdio/vsscanf.c
@ -41,6 +41,15 @@ vsscanf (char const *s, char const *template, va_list ap)
      {
        t++;
        char c = *t;
+        int skip_p = 0;
+        int length = -1;
+        if (c == '*')
+          skip_p = 1;
+        if (c >= '0' && c <= '9')
+          {
+            length = abtol (&t, 10);
+            c = *t;
+          }
        if (c == 'l')
          c = *++t;
        switch (c)
@ -52,18 +61,27 @@ vsscanf (char const *s, char const *template, va_list ap)
            }
          case 'c':
            {
-              char *c = va_arg (ap, char *);
-              *c = *p++;
-              count++;
+              char r = *p++;
+              if (!skip_p)
+                {
+                  char *c = va_arg (ap, char *);
+                  *c = r;
+                  count++;
+                }
              break;
            }
          case 'd':
          case 'i':
          case 'u':
            {
-              int *d = va_arg (ap, int *);
-              *d = abtol ((char const **)&p, 10);
-              count++;
+              if (skip_p)
+                abtol ((char const **) &p, 10);
+              else
+                {
+                  int *d = va_arg (ap, int *);
+                  *d = abtol ((char const **) &p, 10);
+                  count++;
+                }
              break;
            }
          case 'e':
@ -72,15 +90,84 @@ vsscanf (char const *s, char const *template, va_list ap)
          case 'E':
          case 'G':
            {
-              float *f = va_arg (ap, float *);
-              *f = strtod (p, &p);
-              count++;
+              if (skip_p)
+                strtod (p, &p);
+              else
+                {
+                  float *f = va_arg (ap, float *);
+                  *f = strtod (p, &p);
+                  count++;
+                }
+              break;
+            }
+          case 's':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char r = *p;
+              while (r && !isspace (r) && (length == -1 || length--))
+                {
+                  if (!skip_p)
+                    *s++ = r;
+                  r = *++p;
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
+              break;
+            }
+          case '[':
+            {
+              char *s = skip_p ? 0 : va_arg (ap, char *);
+              char set[1024];
+              int i = 0;
+              int not_in_set_p = 0;
+              t++;
+              if (*t == '^')
+                {
+                  not_in_set_p = 1;
+                  t++;
+                }
+              if (*t == ']' || *t == '-')
+                set[i++] = *t++;
+              while (*t && *t != ']')
+                {
+                  if (*t == '-')
+                    {
+                      char end = *t++;
+                      for (char x = set[i - 1] + 1; x < end; x++)
+                        set[i++] = x;
+                    }
+                  else
+                    set[i++] = *t++;
+                }
+              set[i] = 0;
+              char r = *p;
+              while (r && (length == -1 || length--))
+                {
+                  int match = (int) (long) strchr (set, r);
+                  if (not_in_set_p)
+                    match = !match;
+                  if (!match)
+                    break;
+                  if (!skip_p)
+                    *s++ = r;
+                  r = *++p;
+                }
+              if (!skip_p)
+                {
+                  count++;
+                  *s = 0;
+                }
              break;
            }
          default:
            {
              eputs ("vsscanf: not supported: %:");
              eputc (c);
+              eputs (", in template: ");
+              eputs (template);
              eputs ("\n");
              t++;
              p++;
--- a/lib/stdlib/atexit.c
+++ b/lib/stdlib/atexit.c
@ -25,4 +25,5 @@ int
 atexit (void (*function) (void))
 {
  __call_at_exit = function;
+  return 0;
 }
--- 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/stdlib/qsort.c
+++ b/lib/stdlib/qsort.c
@ -19,62 +19,62 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stdlib.h>
-#include <string.h>
+/* See: https://en.wikipedia.org/wiki/Quicksort */

-void
-qswap (void *a, void *b, size_t size)
+#include <stdlib.h>
+
+static void
+qswap (char *a, char *b, size_t size)
 {
-  char *pa = a;
-  char *pb = b;
-  do
-  {
-    char tmp = *pa;
-    *pa++ = *pb;
-    *pb++ = tmp;
-  } while (--size > 0);
+  while (size-- > 0)
+    {
+      char tmp = *a;
+      *a++ = *b;
+      *b++ = tmp;
+    }
 }

-size_t
-qpart (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
+static size_t
+qpart (char *base, size_t lo, size_t hi, size_t size,
+       int (*compare) (void const *, void const *))
 {
-  void *p = base + count * size;
-  size_t i = 0;
-  for (size_t j = 0; j < count; j++)
+  char *pivot = base + hi * size;
+  size_t i = lo;
+
+  for (size_t j = lo; j < hi; j++)
    {
-      int c = compare (base + j * size, p);
-      if (c < 0)
+      char *pj = base + j * size;
+      if (pj != pivot && compare (pj, pivot) < 0)
        {
-#if 1                           //__x86_64__
-          qswap (base + i * size, base + j * size, size);
-#else
-          int p1 = base + i * size;
-          int p2 = base + j * size;
-          qswap (p1, p2, size);
-#endif
+          void *pi = base + i * size;
+          qswap (pi, pj, size);
          i++;
        }
-      else if (c == 0)
-        i++;
    }
-  if (compare (base + count * size, base + i * size) < 0)
-    qswap (base + i * size, base + count * size, size);
+
+  char *pi = base + i * size;
+  qswap (pi, pivot, size);
+
  return i;
 }

-void
-qsort (void *base, size_t count, size_t size, int (*compare) (void const *, void const *))
+static void
+_qsort (void *base, size_t lo, size_t hi, size_t size,
+        int (*compare) (void const *, void const *))
 {
-  if (count > 1)
-    {
-      int p = qpart (base, count - 1, size, compare);
-      qsort (base, p, size, compare);
-#if 1                           //__x86_64__
-      qsort (base + p * size, count - p, size, compare);
-#else
-      int p1 = base + p * size;
-      int p2 = count - p;
-      qsort (p1, p2, size, compare);
-#endif
-    }
+  if (lo >= hi)
+    return;
+  size_t pi = qpart (base, lo, hi, size, compare);
+  if (pi > 0)
+    _qsort (base, lo, pi - 1, size, compare);
+  _qsort (base, pi + 1, hi, size, compare);
+}
+
+void
+qsort (void *base, size_t count, size_t size,
+       int (*compare) (void const *, void const *))
+{
+  if (count <= 1)
+    return;
+  _qsort (base, 0, count - 1, size, compare);
 }
--- a/lib/string/strerror.c
+++ b/lib/string/strerror.c
@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
 * 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.
 *
@ -77,5 +77,7 @@ strerror (int errnum)
    }
  if (errnum > 0 && errnum <= sys_nerr)
    return sys_errlist[errnum];
-  return "sterror: unknown error";
+  static char buf[40] = "strerror: unknown error: ";
+  strcat (buf, itoa (errnum));
+  return buf;
 }
--- a/lib/string/strtok.c
+++ b/lib/string/strtok.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 © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,14 +18,25 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <linux/syscall.h>
-#include <syscall.h>
-#include <sys/stat.h>
+#include <string.h>

-int
-chmod (char const *file_name, int mask)
+char *
+strtok (char *new_string, char const *delimiters)
 {
-  long long_file_name = file_name;
-  long long_mask = mask;
-  return _sys_call2 (SYS_chmod, long_file_name, long_mask);
+  static char *mark;
+  if (new_string)
+    mark = new_string;
+  if (!*mark)
+    return 0;
+  while (strchr (delimiters, *mark))
+    mark++;
+  char *point = mark;
+  while (*mark && !strchr (delimiters, *mark))
+    mark++;
+  if (*mark)
+    {
+      *mark = 0;
+      mark++;
+    }
+  return point;
 }
--- a/include/gnu/x86/kernel-stat.h
+++ b/include/gnu/x86/kernel-stat.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 © 2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -17,9 +17,17 @@
 * 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 __MES_GNU_X86_KERNEL_STAT_H
-#define __MES_GNU_X86_KERNEL_STAT_H 1

-#include <arch/syscall.h>
+#include <mes/lib.h>
+#include <stdlib.h>
+#include <string.h>

-#endif // __MES_GNU_X86_KERNEL_STAT_H
+void
+__buffered_read_init (int filedes)
+{
+}
+
+size_t
+__buffered_read_clear (int filedes)
+{
+}
--- 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/lib/stub/asctime.c
+++ b/lib/stub/asctime.c
@ -0,0 +1,34 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * 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/>.
+ */
+
+#include <mes/lib.h>
+#include <errno.h>
+#include <time.h>
+
+char *
+asctime (struct tm const *broken_time)
+{
+  static int stub = 0;
+  if (__mes_debug () && !stub)
+    eputs ("asctime stub\n");
+  stub = 1;
+  errno = 0;
+  return "now";
+}
--- a/lib/stub/getpagesize.c
+++ b/lib/stub/getpagesize.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 © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -18,11 +18,15 @@
 * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <mes/lib.h>
+#include <limits.h>
+
 int
-mes_open (char *file_name, int flags, int mask)
+getpagesize (void)
 {
-  int filedes = open (file_name, flags, mask);
-  if (filedes > 2)
-    __ungetc_clear (filedes);
-  return filedes;
+  static int stub = 0;
+  if (__mes_debug () && !stub)
+    eputs ("getpagesize stub\n");
+  stub = 1;
+  return PAGE_SIZE;
 }
--- a/lib/stub/strsignal.c
+++ b/lib/stub/strsignal.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 © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 *
 * This file is part of GNU Mes.
 *
@ -21,16 +21,14 @@
 #include <mes/lib.h>
 #include <string.h>

-char *__brk = 0;
-
-void *
-malloc (size_t size)
+char *
+strsignal (int signum)
 {
-  if (!__brk)
-    __brk = cast_long_to_charp (brk (0));
-  if (brk (__brk + size) == -1)
-    return 0;
-  char *p = __brk;
-  __brk = __brk + size;
-  return p;
+  static int stub = 0;
+  if (__mes_debug () && !stub)
+    eputs ("strsignal stub\n");
+  stub = 1;
+  static char buf[30] = "Unknown signal: ";
+  strcat (buf, itoa (signum));
+  return buf;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jan (janneke) Nieuwenhuizen	c1c08d5583	Revert "squash! DRAFT lib: stdint: Remove __SIZEOF_LONG_LONG__ guard." This reverts commit e1f729b2bad791c56b16e386fe71706a6d0d1ee9.	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	25fa1193af	squash! syscall <arch>	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	41d827c7cf	lib: readdir: save_errno.	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	12b3a82d6a	squash! DRAFT lib: stdint: Remove __SIZEOF_LONG_LONG__ guard.	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	9803ffc1e5	DRAFT lib: Add strsignal stub. * lib/stub/strsignal.c: New file. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Add it. * include/string.h (strsignal): Add prototype.	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	502b7c1eea	DRAFT lib: strerror: Fix typo, fix static message. * lib/string/strerror.c (strerror): Fix typo, always show error number.	2022-10-29 20:43:56 +02:00
Jan (janneke) Nieuwenhuizen	7cbe2b1152	squash! stat * configure (main): Copy <srcdest>include/<kernel>/<arch>/.h to include/. configure.sh: Likewise. * .gitignore: Ignore them. Add copyright header. * 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.	2022-10-29 20:43:55 +02:00
Jan (janneke) Nieuwenhuizen	cb49899215	squash! stat	2022-10-29 16:38:15 +02:00
Jan (janneke) Nieuwenhuizen	5421058c84	squash! stat	2022-10-29 16:33:53 +02:00
Jan (janneke) Nieuwenhuizen	d270e5ef24	DRAFT lib: stat: Use SYS_stat64 for 32bit platforms. * include/linux/arm/syscall.h (SYS_stat64): New define. * include/linux/x86/syscall.h (SYS_stat64): Likewise. * lib/linux/stat.c (SYS_stat)[(__i386__ \|\| __arm__) && SYS_stat64): Redefine to SYS_stat64.	2022-10-29 16:30:10 +02:00
Jan (janneke) Nieuwenhuizen	23b101b54b	squash! linux/open.c	2022-10-29 16:30:10 +02:00
Jan (janneke) Nieuwenhuizen	ecb719f01f	DRAFT lib: __assert_fail: Update to standard. * lib/mes/__assert_fail.c (__assert_fail): Add file, line, function parameters. * lib/mes/assert_msg.c (assert_msg): Update caller. * include/assert.h (assert): Update caller. (__assert_fail): Update prototype. * include/mes/lib.h (__assert_fail): Likewise.	2022-10-26 21:26:06 +02:00
Jan (janneke) Nieuwenhuizen	c654786852	DRAFT lib: setitimer: Rename from settimer. * lib/linux/settimer.c: Rename to... * lib/linux/setitimer.c: ...this. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Update accordingly.	2022-10-26 20:50:34 +02:00
Jan (janneke) Nieuwenhuizen	04123ab49d	DRAFT lib: Add localeconv. * lib/locale/localeconv.c: New file. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Add it. * include/locale.h (struct lconv): New type. (localeconv): Add prototype.	2022-10-26 20:50:34 +02:00
Jan (janneke) Nieuwenhuizen	c3cdac8d0a	DRAFT lib: Add getpagesize stub. * include/limits.h (PAGE_SIZE): New define. * lib/stub/getpagesize.c: New file. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Add it. * include/unistd.h (getpagesize): Add prototype.	2022-10-26 20:50:34 +02:00
Jan (janneke) Nieuwenhuizen	3fd7ba82a6	DRAFT lib: stdint: Remove __SIZEOF_LONG_LONG__ guard. * include/stdint.h (uint64_t, int64_t): Add unconditionally.	2022-10-26 20:50:27 +02:00
Jan (janneke) Nieuwenhuizen	31679d6e86	DRAFT lib: Add sysconf stub. * lib/stub/sysconf.c: New file. * include/unistd.h (sysconf): Add prototype.	2022-10-26 15:33:12 +02:00
Jan (janneke) Nieuwenhuizen	dfab232bbb	lib: test: Add 80-qsort-stress. * lib/tests/stdlib/80-qsort-stress.c: New test. * build-aux/check-mescc.sh (tcc_tests): Add it.	2022-10-25 16:02:04 +02:00
Jan (janneke) Nieuwenhuizen	16282f8ecd	lib: stdio/qsort: Refactor, fixes GCC-4.6.4. * lib/stdlib/qsort.c (qswap): Refactor. (qpart): Add "lo" parametor, use "hi" instead of count. Refactor. (qsort): Move to... (_qsort): ...this, and refactor. (qsort): New function.	2022-10-25 16:02:04 +02:00
Jan (janneke) Nieuwenhuizen	7b3d0c7aa6	lib: test: 80-qsort: Fix warnings. * lib/tests/stdlib/80-qsort.c: Include missing stdlib.h. (compare_int): Fix signature.	2022-10-25 15:01:54 +02:00
Jan (janneke) Nieuwenhuizen	f22d640465	doc: Update `HACKING'. * HACKING (SETUP): Update arm triplet.	2022-10-25 15:01:54 +02:00
Danny Milosavljevic	266c207954	lib: vfscanf: Add missing #include. * lib/stdio/vfscanf.c: Add missing #include.	2022-10-25 15:01:54 +02:00
Jan Nieuwenhuizen	895bebf395	build: Improve --with-system-libc support. * lib/stub/asctime.c: Add missing mes/lib.h, errno.h include.	2022-10-25 15:01:54 +02:00
Jan Nieuwenhuizen	c45cbff8ba	lib: vsscanf: Support gcc-4.6.4: Support , [, s. lib/stdio/vsscanf.c (vsscanf): Support , [, s. lib/stdio/vfscanf.c (vfscanf): Likewise. * lib/tests/stdio/90-sscanf.c: Test it. * build-aux/check-mescc.sh (tests): Run it. * lib/x86-mes/x86.M1 (mov____%al,0x32(%ebp): New macro.	2022-10-25 15:01:54 +02:00
Jan Nieuwenhuizen	571ea5ce9e	lib: Support gcc-4.6.4: Avoid type/size_t conflicts. * include/stdint.h: Remove typedefs, include sys/types.h.	2022-10-25 15:01:54 +02:00
Jan Nieuwenhuizen	130d6c465f	lib: Support gcc-4.6.4: Add strtok. * include/string.h (strtok): Declare. * lib/string/strtok.c (strtok): New file. * lib/libc+gnu.c: Include it.	2022-10-25 15:01:54 +02:00
Jan (janneke) Nieuwenhuizen	c2784d43de	lib/tests: Add 90-mmap.c. * lib/tests/posix/90-mmap.c: New test. * build-aux/check-mescc.sh (gnu_tests): Add it.	2022-10-25 15:01:53 +02:00
Jan Nieuwenhuizen	f17307c418	lib: Support gcc-4.6.4: Add mmap, munmap. * include/linux/x86/syscall.h (SYS_mmap, SYS_munmap): New defines. * include/linux/x86_64/syscall.h (SYS_mmap, SYS_munmap): New defines. * include/linux/arm/syscall (SYS_mmap, SYS_munmap): New defines.. * include/sys/mman.h (MAP_SHARED, MAP_PRIVATE, MAP_ANONYMOUS, MAP_POPULATE, MAP_ANON, MAP_FAILED): New macro. (mmap, munmap): Declare. * lib/linux/x86-mes-gcc/mes.c (_sys_call6): New function. * lib/linux/x86-mes/mes.c (__sys_call6): New function. (_sys_call6): New function. * lib/linux/x86_64-mes-gcc/mes.c (_sys_call6): New function. * lib/linux/x86_64-mes/mes.c (__sys_call): Cater for 6 syscall parameters. (_sys_call6): New function. * lib/x86-mes/x86.M1 (pop____%ebp): New macro. * lib/x86_64-mes/x86_64.M1 (mov____0x8(%rbp),%r9): New macro. * lib/linux/arm-mes-gcc/syscall.c (_sys_call6, __sys_call6): Enable. * lib/linux/mmap.c: New file. * lib/linux/munmap.c: New file. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Add them.	2022-10-25 15:01:53 +02:00
Jan Nieuwenhuizen	48e495189e	lib: Support gcc-4.6.4: Add labs. * lib/math/labs.c: New file. * include/math.h (labs): Declare. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Add it.	2022-10-25 15:01:53 +02:00
Jan Nieuwenhuizen	3f5a2523ac	lib: Support gcc-4.6.4: Implement rewind. * lib/stdio/rewind.c: Move from ../stub. Implement. * include/stdio.h (rewind): Declare. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Update include. * lib/stub/rewind.c: Remove.	2022-10-25 15:01:53 +02:00
Jan Nieuwenhuizen	2792233e56	lib: Support gcc-4.6.4: Add asctime stub. * lib/stub/asctime.c: New file. * lib/libc+gnu.c: Include it. * include/time.h (asctime): Declare.	2022-10-25 15:01:53 +02:00
Jan Nieuwenhuizen	85153b6fa8	lib: vfprintf, vsnprintf: Support gcc-4.6.4: #-type. * lib/stdio/vfscanf.c (vfscanf): Show whole template upon error. * lib/stdio/vsscanf.c (vsscanf): Likewise. * lib/stdio/vsnprintf.c (vsnprintf): Likewise. Support #-type prefix. * lib/stdio/vfprintf.c (vfprintf): Likewise. Use fileno. Return count. * build-aux/configure-lib.sh (libc_gnu_SOURCES): Move fileno... (libc_tcc_SOURCES): ...here.	2022-10-25 15:01:00 +02:00
Jan Nieuwenhuizen	7799f3688e	lib: atexit: Support gcc-4.6.4: return 0. * lib/stdlib/atexit.c (atexit): return 0.	2019-02-08 13:29:30 +01:00
Jan Nieuwenhuizen	fc50c1be58	lib: Support gcc-4.6.4: Add SSIZE_MAX macro. * include/stdint.h (SSIZE_MAX): New macro.	2019-02-07 21:18:06 +01:00
Jan Nieuwenhuizen	c7e08071ee	lib: Support gcc-4.6.4: Add float macros. * include/float.h (DBL_EPSILON, DBL_MANT_DIG, DBL_MAX, DBL_MIN, FLT_RADIX, LDBL_EPSILON, LDBL_MANT_DIG, LDBL_MAX, LDBL_MIN): New macro.	2019-02-01 09:29:49 +01:00
Jan Nieuwenhuizen	d55a7d946b	lib: Support gcc-4.6.4: Add stdint [U]SHRT macros. * include/stdint.h (SHRT_MAX, SHRT_MIN, USHRT_MAX, USHRT_MIN): New macro.	2019-02-01 09:29:39 +01:00
Jan Nieuwenhuizen	223606b2ca	lib: Support gcc-4.6.4: Fix uintptr_t, add [u]intmax_t. * include/stdint.h: Fix uintptr_t, add [u]intmax_t.	2019-01-16 13:21:36 +01:00
Jan (janneke) Nieuwenhuizen	c2e41ff647	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.	2022-10-19 10:01:48 +02:00
Jan (janneke) Nieuwenhuizen	75fde18d24	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	3ee3a94525	scaffold: Remove obsolete malloc. * scaffold/lib/stdlib/malloc.c: Remove.	2022-05-07 08:45:06 +02:00
Jan (janneke) Nieuwenhuizen	cc33dd95c3	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	770ae64ccc	linux/read.c remove extra mes.h include.	2022-05-05 23:26:28 +02:00
Jan (janneke) Nieuwenhuizen	9af39b008e	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	9c7e1550a1	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	a2f0f44a96	kaem: Add kaem.arm and kaem.x86. * kaem.arm, kaem.x86: New files.	2022-05-03 23:35:41 +02:00
Jan (janneke) Nieuwenhuizen	950314486b	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	d92143cb0a	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	7641a5a8a7	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	9f4d81eec4	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	276d895b1e	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	12480dfe0c	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	34352f53c2	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	514287808f	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	e7e62923f4	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	3fc272ec31	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	b79f0269ac	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	010ab9ae74	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	81b680a9c6	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	ff3c6ad66b	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	cfa8f0db84	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	02ffc5da94	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	0f362be1da	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	f8ea51ae2b	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	f6c53ac80d	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