From 424aa5be38a3023aa6842883a3954599b1597986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Wed, 4 May 2022 19:32:45 +0100
Subject: [PATCH] Move from mes-m2 to mes-0.24.

---
 SHA256SUMS.sources                            |   3 +-
 parts.rst                                     |  30 ++---
 sysa.py                                       |   8 +-
 sysa/SHA256SUMS.pkgs                          |   4 +-
 sysa/after.kaem                               |   4 +-
 sysa/bash-2.05b/checksums                     |   2 +-
 sysa/bzip2-1.0.8/checksums                    |   2 +-
 sysa/coreutils-5.0/checksums                  | 108 +++++++++---------
 sysa/gzip-1.2.4/checksums                     |   2 +-
 sysa/heirloom-devtools-070527/checksums       |   4 +-
 sysa/helpers.sh                               |   9 +-
 sysa/make-3.80/checksums                      |   2 +-
 sysa/mes-0.23/mes-libc-0.23.sh                |  73 ------------
 sysa/mes-0.23/patches/crt1.patch              |  27 -----
 sysa/{mes => mes-0.24}/checksums              |  17 +--
 sysa/{mes => mes-0.24}/files/config.h         |   2 +-
 sysa/{mes => mes-0.24}/files/mescc.scm        |   2 +-
 sysa/{mes/mes.kaem => mes-0.24/mes-0.24.kaem} |  31 ++++-
 sysa/patch-2.5.9/checksums                    |   2 +-
 sysa/run.sh                                   |  42 +++----
 sysa/sed-4.0.9/checksums                      |   2 +-
 sysa/tar-1.12/checksums                       |   2 +-
 sysa/tcc-0.9.26/checksums                     |  18 +--
 sysa/tcc-0.9.26/tcc-0.9.26.kaem               |  12 +-
 sysa/tcc-0.9.27/checksums                     |   2 +-
 .../patches/ignore-duplicate-symbols.patch    |   2 +-
 sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh        |  38 ------
 sysc/run2.sh                                  |   2 +-
 28 files changed, 156 insertions(+), 296 deletions(-)
 delete mode 100755 sysa/mes-0.23/mes-libc-0.23.sh
 delete mode 100644 sysa/mes-0.23/patches/crt1.patch
 rename sysa/{mes => mes-0.24}/checksums (54%)
 rename sysa/{mes => mes-0.24}/files/config.h (87%)
 rename sysa/{mes => mes-0.24}/files/mescc.scm (96%)
 rename sysa/{mes/mes.kaem => mes-0.24/mes-0.24.kaem} (92%)
 delete mode 100755 sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh

diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 2264553..ba19ae8 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -76,8 +76,7 @@ eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7  libunistring-0
 64b30b41fde2ebf669e6af489883fb1df6a06ac30555a96cfa3c39ecce7267dd  make-3.80.tar.gz
 3d991b33e604187c5881a0abc2e102d5b9776da5569640e73778f85d617242e7  make-3.82.tar.gz
 e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7  make-4.2.1.tar.gz
-7a140e43565181bb54bf416117ea0efff057922ed284db5fc98b3740a7f3d956  mes-0.23.tar.gz
-a8da14d1cd6aaa1ff607a571a8ca5948258195c712de05b0f8ad11c215b6b094  mes.tar.gz
+828be15e02c103df8a248232491fba10d763724d6ec10f08a2e0e1d249bd9902  mes-0.24.tar.gz
 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459  mpc-1.2.1.tar.gz
 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f  mpfr-4.1.0.tar.xz
 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
diff --git a/parts.rst b/parts.rst
index 53a72fd..d314e1e 100644
--- a/parts.rst
+++ b/parts.rst
@@ -10,9 +10,8 @@ stage0-posix
 ============
 
 This is where all the magic begins. We start with our hex0 and kaem
-seeds and bootstrap our way up to M2-Planet, a subset of C, and mes-m2,
-an independent port of GNU Mes to M2-Planet. The following steps are
-taken here:
+seeds and bootstrap our way up to M2-Planet, a subset of C.
+The following steps are taken here:
 
 -  hex0 (seed)
 -  hex0 compiles hex1
@@ -47,7 +46,7 @@ of generated binaries. We also build initial ``untar`` and ``ungz``
 utilities to deal with compressed archives.
 
 ``/sysa``
-==========
+=========
 
 We now move into the ``/sysa`` directory. As stage0-posix has no
 concept of ``chdir()`` (not added until very late in stage0-posix),
@@ -55,8 +54,8 @@ we have to copy a lot of files into the root of the initramfs, making it
 very messy. We get into the move ordered directory ``/sysa`` here,
 copying over all of the required binaries from ``/``.
 
-mes
-===
+mes 0.24
+========
 
 ``mes`` is a scheme interpreter. It runs the sister project ``mescc``,
 which is a C compiler written in scheme, which links against the Mes C
@@ -66,8 +65,8 @@ using the experimental ``wip-m2`` branch to jump over the gap between
 
 1. Compiling an initial mes using ``M2-Planet``. Note that this is
    *only* the Mes interpreter, not the libc or anything else.
-2. We then use this to compile the Mes libc. We need the libc to compile
-   all the programs until we get musl.
+2. We then use this to recompile the Mes interpreter as well as building
+   the libc. This second interpreter is faster and less buggy.
 
 tinycc 0.9.26
 =============
@@ -181,23 +180,10 @@ recognize lexical patters.
 
 Unfortunately ``flex`` also depends on itself for compiling its own
 scanner, so first flex 2.5.11 is compiled, with its scanner definition
-manually modified so that it can be processed by lex for the Heirloom
+manually modified so that it can be processed by lex from the Heirloom
 project (the required modifications are mostly syntactical, plus a few
 workarounds to avoid some flex advanced features).
 
-mes 0.23 (libc)
-===============
-
-In order to build musl we need tcc to support more than 255 command line
-arguments. Due to the bug in older mes libc this was not possible. Hence,
-we patch mes libc.
-
-tcc 0.9.27
-==========
-
-Rebuild tcc 0.9.27 to get the fix from patched mes libc. We have to do
-it using older ``tcc`` because tcc-0.9.27 is not self hosting.
-
 musl 1.1.24
 ===========
 
diff --git a/sysa.py b/sysa.py
index 47e1a87..484718b 100755
--- a/sysa.py
+++ b/sysa.py
@@ -93,16 +93,12 @@ class SysA(SysGeneral):
         """Prepare remaining sources"""
 
         # mes-0.22 snapshot with m2 fixes
-        self.get_file(["https://github.com/oriansj/mes-m2/archive/dad1744fa80f52b3b428803c06b09d39c285f500.tar.gz",
-                       "https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz"],
-                      output=["mes.tar.gz", "nyacc-1.00.2.tar.gz"])
+        self.get_file(["https://mirrors.kernel.org/gnu/mes/mes-0.24.tar.gz",
+                       "https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz"])
 
         # tcc 0.9.26 patched by janneke
         self.get_file("https://lilypond.org/janneke/tcc/tcc-0.9.26-1136-g5bba73cc.tar.gz", output="tcc-0.9.26.tar.gz")
 
-        # mes 0.23 (meslibc)
-        self.get_file("https://mirrors.kernel.org/gnu/mes/mes-0.23.tar.gz")
-
         # gzip 1.2.4
         self.get_file("https://mirrors.kernel.org/gnu/gzip/gzip-1.2.4.tar.gz")
 
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 9c698eb..b0dbf28 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -174,9 +174,7 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  tcc-0.9.27_0.l
 b69c042a33cbf18e5a2a5a886d675ebcced92f57eec95b0f47345df8f1e89cf0  tcc-0.9.27_1.links
 1086136d7bb8e0c3b4bba9aa3b0442412d58bdd3effa790015f85a723c9804e1  tcc-0.9.27_1.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  tcc-0.9.27_2.links
-d88a72f36e947462b5bea9b56ecf6c828b8ba7c363af00e2b02303095555cabe  tcc-0.9.27_2.tar.bz2
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  tcc-0.9.27_3.links
-733df9aae85fbf422aac26fe0354c48d035f7a5fb4f79b00e666e0763914aeca  tcc-0.9.27_3.tar.bz2
+733df9aae85fbf422aac26fe0354c48d035f7a5fb4f79b00e666e0763914aeca  tcc-0.9.27_2.tar.bz2
 8cc08f90342fdbfac51c9d3d0219f2b5bbf54ef3272aa16c1cee28a97e281822  texinfo-6.7_0.x86.xbps
 970cc84444fecc225becb0db24671a186888a8a8d37daf3f40d827a907181a12  util-linux-2.19.1_0.links
 c5e290b56f7a148b874e148d41050660eaac62124aff8ec29f277a584c4ee672  util-linux-2.19.1_0.tar.bz2
diff --git a/sysa/after.kaem b/sysa/after.kaem
index 24e1e77..2441eb8 100755
--- a/sysa/after.kaem
+++ b/sysa/after.kaem
@@ -21,8 +21,8 @@ TMPDIR=/tmp # tmpdir is needed for patch to work
 
 # Environmental variables needed for mes
 NYACC_PKG=nyacc-1.00.2
-MES_PKG=mes
-MES_PREFIX=${sysa}/${MES_PKG}/build/mes-m2-dad1744fa80f52b3b428803c06b09d39c285f500
+MES_PKG=mes-0.24
+MES_PREFIX=${sysa}/${MES_PKG}/build/${MES_PKG}
 GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/build/${NYACC_PKG}/module
 mkdir -p ${prefix} ${bindir} ${libdir} ${incdir} ${TMPDIR}
 cd ${prefix}
diff --git a/sysa/bash-2.05b/checksums b/sysa/bash-2.05b/checksums
index deb3aef..5bfc02f 100644
--- a/sysa/bash-2.05b/checksums
+++ b/sysa/bash-2.05b/checksums
@@ -1 +1 @@
-acdf525758fa636bcbab894e2ce5d239a4b84b013d00323667c4e898ca05ff4a  /usr/bin/bash
+413b0656796503549a35f74f0cc1f9107005d17530b164a2e0fe0579f1531709  /usr/bin/bash
diff --git a/sysa/bzip2-1.0.8/checksums b/sysa/bzip2-1.0.8/checksums
index 2bf207f..cc77a86 100644
--- a/sysa/bzip2-1.0.8/checksums
+++ b/sysa/bzip2-1.0.8/checksums
@@ -1 +1 @@
-b9b82b004c42ed9d7a35f37ee6b0886929cc08ee252368cd883ff6b979988540  /usr/bin/bzip2
+645c5d6c8bb1e643770fb2122cda44c24d9283e8a3ed3e44575d73287aea3449  /usr/bin/bzip2
diff --git a/sysa/coreutils-5.0/checksums b/sysa/coreutils-5.0/checksums
index b2dc202..02e4ac4 100644
--- a/sysa/coreutils-5.0/checksums
+++ b/sysa/coreutils-5.0/checksums
@@ -1,54 +1,54 @@
-11c674157ec621bee9f93742eaf96b27ab6df5017f092cd01918388ce5a97823  /usr/bin/install
-f6dd08d95b1ecdd32c7804afa226d734fb4efbe54e67532023deb3a95df2899d  /usr/bin/basename
-8bf26dadc87990c5ec5fe6551145049d52ded48640ce7ac47b05b458ff870cfa  /usr/bin/cat
-d58a4c9f71e6a9515c91c497ed589cfc308ee3544575ec01ad4e7fa8116ae332  /usr/bin/chmod
-994197dd07610b44608b388242c70adb9ec49bb2a643dcfdfb1e105529c2e379  /usr/bin/cksum
-24d0111d0c417828d2a4e1aa24b40010792b8c143e16c4e549e2797b01514fd0  /usr/bin/cp
-a09aeffc07c868076aa034fd1650f8faca703379aa31d5b5fd911adf98901c82  /usr/bin/csplit
-e3149e91b206a83b4e7341b5df6ddefddfe04be4b9859642b23e2ee684de0e2d  /usr/bin/cut
-39713a15ea9b4a46d01f8d0a2ca99fe83acab34980442cf4e26d0c495e63acd3  /usr/bin/echo
-b9b229f0cfe7c2077c7f1ce30b91d07ae02794bb52520367053e4c5dae815617  /usr/bin/expand
-79f91e16249f8f595fb4dd68a05413c8f28bd3a15f25ed07d602b504f745b33f  /usr/bin/factor
-a7071f0800ed49164535244ac82e6288ca7f4c9ef119ce722e809c965feba43e  /usr/bin/false
-c7c581160a28eaea971e1333b19e07b81e98897a251f05f8fe5fd1fd2c89ad2a  /usr/bin/fmt
-bfdeeba7192725dc6f5b4084f73e42d518a05900af05a062b4862fcb3b7a5a0d  /usr/bin/fold
-b914fce359292bd4134af0d0086c4d5920a6482e784c60483c60daa86ba3e2ca  /usr/bin/head
-142cd716a75921fc3d4f824c75515147f12b53e83f0a89a09f17aaaeaa9b1543  /usr/bin/id
-890bd5186317a1da5309881ad12426e45144b059436b7045a18ab670ac34585b  /usr/bin/join
-c8d87edb84146d2c536be5cea326b5fe456eb9fb39511f535312e52577d1c229  /usr/bin/kill
-5c827dc96610836ec41ced32fdff18584dfa7380431cf5f99960effcec16b6da  /usr/bin/link
-75da5a77d612a6c9ab2c63f52e0c53613917b46f243a6ca78a15edc1ab2322d2  /usr/bin/ln
-e74bc32191c7f53b659c7b1937d9799e7e56a71f0d68a00a085df99d900ac71a  /usr/bin/logname
-7dce8cb879dca250713df0fb9ae496755ba6ef455b1c46c500b0f4074e77bedd  /usr/bin/mkfifo
-8ef9d767efe94fd240ef54dfcc1e9eb956f3908fd27279e6f8c4f9034be9a188  /usr/bin/mkdir
-5643f24deacde0aa38066dcdc98ada987267a92172def48d3d115148379f306d  /usr/bin/mknod
-95cf6269ae7608960bf1eb1062cd8f1f9981534b8e66449c3076c2b270f02970  /usr/bin/nl
-82109de6321e241128763333ba7e32db91d6fd07124dd3198fdd80f5c8679cf5  /usr/bin/od
-89537a3ff8d001059b2875e49b02e64f5cc9e70ee0053b1407c9e13a949097cf  /usr/bin/paste
-876bf7b6743fb7a8b9967f9f8ae0ce7deabe9a109b5d8655e2042435c8dc9141  /usr/bin/pathchk
-0eb7a6d22a2a1daccd547e4f61090bf7a19ed63a3aec64076d9b6b14ad5ac873  /usr/bin/printf
-0c7b355b1b81093b740efd5afdec417f1902edb3c4c7335320ad371aa67e66a5  /usr/bin/ptx
-a5a7d59c3daddcd12a5a1f69710f970fba40f319baa6e8a2d7ee6da55936d046  /usr/bin/pwd
-bb5be58fc44331fedc405f28d6bf9014105376db48ab6921de4468c26868b0cd  /usr/bin/readlink
-cf83e7cf46b52440d593d08c03859bf2354affd3d184d4975fb4d1ba0a9b5260  /usr/bin/rmdir
-ed0e8f05df2f9a757a783a783d4d5efc4fc85d5f5ade8b61b6c32bd64047eaaf  /usr/bin/seq
-3a839fe7e32dff6a2597390660beb10ee15eabd2d1fe4531a58eed035fa0db5f  /usr/bin/sleep
-978bab078ddc398c8617697143265b5c0791d74730895243e11f30f208389095  /usr/bin/split
-ee8532ca989f75ec263121c20f13474ad73aafa503bb2ae2f785708b0244c329  /usr/bin/sum
-40d71b38897a5ceacd45a4c49a2d84dab4d175fff4e7fcf98785c31d2ec715f2  /usr/bin/tail
-cb8ff79e7566d6fbfe0c5d384163585306a9ef7e9e525fea0bf0c8a5c2af8238  /usr/bin/tee
-6ab10d4a009e2b134c7e854f2561da93d74b95701d538659284d5035bc88ff89  /usr/bin/tr
-062e387534cc7661b11346524f84e38f5e64a4326819377b9bc3aa675fb6a409  /usr/bin/tsort
-07103fb0d194c01576894c800eecc3be9588103e93c6e8b9c0e6063fb9dde5af  /usr/bin/unexpand
-054c7b8ef262065dc965b885baa858602165609322196515a6e9415b0f9a21e5  /usr/bin/unlink
-545d17edd4994ab9d405b27b0ebd5d9ef1e3d4c1c172bc5c47112a740ce88e15  /usr/bin/wc
-9464990ed84759efab8bc3b5b67cf6f77c03ccf988bbe6e571a12ea3d6b01cd9  /usr/bin/whoami
-0b36cb15c6174b947de4090284d6f68fea18c6b6a9f23e0c95602b62ce988667  /usr/bin/test
-0d1e615de04e3d99b5cfd9b86eac332113227eb87707e025748ddde134720596  /usr/bin/touch
-af3a6577c63e79cd2bbabd3c966790ef006c2d5d2584573ba91667d45f80fec3  /usr/bin/true
-0321a3302b2883914612d9e3dad00e5f338e5c9541651ef293bb38503a9ae39c  /usr/bin/yes
-c6c9e2a80b89f63611d4d4df687bd69f79701edd957c4f6263eb210c4180ca0a  /usr/bin/ls
-acb87cf7d9c1be94dde273bf3f9ab21115ff86a1cc783963dd7571729c4a82e8  /usr/bin/md5sum
-5400125a5ebe89e3c3841116720ca175522c6d697e960f32239d7ef3f3b8d4cb  /usr/bin/mv
-ba5655e1ae7be5b5655513b19d03d385840c707528bd0baa907dc2b117d35d97  /usr/bin/rm
-330d475015d0d78af61789f44d636b14082d64a64dd7faf481677c014fb5a606  /usr/bin/sha1sum
+1eadb9dfa7a7b402b0b839af59cb23b2d695d92e5aae7d9a8bba5d9e13b0a30b  /usr/bin/install
+99950d92a6d48098597b6cca8354880aefda7c894f15f0b0de7d2761a120d0f8  /usr/bin/basename
+14791ea1aa6e794ff5d8e4379da9dc55cbb303d0718cee1afd591bd3ee139976  /usr/bin/cat
+dac32fcf00a693ccbee9da465de8891cbc56e9b22b879380a9658c44fcde3c43  /usr/bin/chmod
+31d0c97f57cd00a61f351b9698c66a235488e0d94c21474a03a02c1aacc802f2  /usr/bin/cksum
+76330e21aec4c49e9f56a9715b31eee928694f67e359700c1c04eb39039d5e9d  /usr/bin/cp
+e6ad1161cf415388cfe8a8ef141c0d940ffc0c2556addcc0fd379b630a31ba12  /usr/bin/csplit
+5d3a8ecbd8a3a469aef1790ed52d26dff413a41d58abbf86ff1b2b5659c27882  /usr/bin/cut
+0eb0840c1f0725a90d7dc8e412d2faee6e960cbf042ceec00257d57319b325f1  /usr/bin/echo
+e22a60043741672709988cfef9ffd245b2b8330ab4bdf2c2a12869a72830b915  /usr/bin/expand
+9b4d7b5a490488c7665f3a019fcf4d272e44be828e09646a1598a9e828bc78e6  /usr/bin/factor
+42ffc8da7125316bd836f77bec55fc2449308437130af51e74f45330988a6a50  /usr/bin/false
+45207ddb955812cb4450d3f0e530dc003f90074de58b5690f2e83246d7734b4a  /usr/bin/fmt
+167c3d5244df8d055e13c7eecdf2519a20f9a2cc2c56a1ef5d2c401ae54a17c7  /usr/bin/fold
+22f6ec5b3973ddfe68f1fad301b4eaec6b30baea053ba25f47c974c0fedeebe3  /usr/bin/head
+e6b2af317c09cc091a76804dd3211fcae43f1f620270388f4216c4b73932ead8  /usr/bin/id
+60d1374e25e51a49d62c33edc09d71eca7730819454a427e1cc5c4ee3e427c82  /usr/bin/join
+20bca4c9ab4b0601e949c11a194c969284627475810f6f5cadc1114bfab858db  /usr/bin/kill
+d8c338d1a4dba6ae1a0e1d663f8b727321a07883f11527c5e88f5edb77a87305  /usr/bin/link
+d67a0dd62e2d3016cc267a44409fa7eb72ee1e4fbb65db1186724e037e02f779  /usr/bin/ln
+93e01f947c0858827d179f9cc01936bb1f967956208682a3e685f36e91ae6583  /usr/bin/logname
+f9c9263db674a01c4429bcd965b6052f307acc3fcf83dd55c0ae76ef670d4952  /usr/bin/mkfifo
+390ce4f1e9ff3fe29002b2973cefc052b737cb9ff381f4423b7d1d6fe32b2b70  /usr/bin/mkdir
+fbbbd329b893a8c05ed8daa2221fc6f62092127b051f6895a25afa5ed5a6d1a5  /usr/bin/mknod
+4689528c538f51dfdfa5f3eab40940f9c04185ffc4ab21c5dcd6ff555d74a2b2  /usr/bin/nl
+c6d13497356cbcf8e5f3e81c57ca51fc05e0d3f8509011cb234b7d65bd189c44  /usr/bin/od
+da360e1f87583f1615d02a4a26b1b37b014b4106f3885696a73621dfc448dfbb  /usr/bin/paste
+a3397c0060e90caa5657799a106fa286d9da40a4a45773f7bbd91a97352bb496  /usr/bin/pathchk
+500abb77ba88ee646731775048f5de966a08b6cbd8a030a03e5e361e8c65a356  /usr/bin/printf
+f479d3bd86503bf90ce88b2d2385f433a0e3cd59d711b013c614c26cc8275ff1  /usr/bin/ptx
+9d1d30ba5be72bea93829fb8cca7ee5d0451ae4a5aa94001572d0b0a56701399  /usr/bin/pwd
+08e94e637c8a2314be5b8a2f0bb1c0b2ed22a851508fe738c8b9db54b3b27e3c  /usr/bin/readlink
+ce39853b7a1b773655731163a0f96cd5fd0a619c2ee67940b32cda910367ae41  /usr/bin/rmdir
+75db2006c03e3586acaa70ed1b90ab913bfa00a7ced46740e2d77b213da828bd  /usr/bin/seq
+da6fcf62764b0e2cc0705c7dda4c3b077304a1550abfff9abf0985545c852bfe  /usr/bin/sleep
+733770fa222a0a9d8323ccc4353b4daf3f1eb4bcd2b02deb55159da2917ad089  /usr/bin/split
+ffe7960b246f43c77079c489f57b9c7ee0a51ddc32ce1382f35347c22c4c6e2e  /usr/bin/sum
+e94aac96a4ee5199c216bc1583b4098430f19d0d276348998c2e06c588157054  /usr/bin/tail
+b6d4d5839f923ef93171cfcd02f79c126d060bafa788775e4da6f97889608f5c  /usr/bin/tee
+c4dfcec63607cf44a4f64a2673892a38c6b5a7aa9821d12c9abe9cf63126ee39  /usr/bin/tr
+90800ed2ee6effe67885e8a8e3c906a348c20dec688b820ce038d695a2271b2c  /usr/bin/tsort
+5f46c8029233f99355a6788c29bc7ddc8fec6f1180aed5e2501b4a399cb98d8f  /usr/bin/unexpand
+6bd0cd1171675044c288434a553e86dd686ce781e0a3d8ce9dc360fd794e5bfa  /usr/bin/unlink
+0c7288eb7dfc707723ef9653be06f49b3b458e22b53f8172733870f612fb0135  /usr/bin/wc
+a92eb5a6e8413bf580718c0fddaac7821a68a8e7918a930c4cb36a2c666d3720  /usr/bin/whoami
+2b6fc3790a81835001001c5b1e0d7f368720288da55241eef9485888db86edb3  /usr/bin/test
+b770b43dc01c8403c5c0c9522e4f2bb851dfaaf8d7a1c45e6ae449f45ee5171a  /usr/bin/touch
+19dc29f6b439546fc113286d09bf5ba6c83663e03037225a6884f66790f5820f  /usr/bin/true
+813d000327b025a0eb17d7a1dd1a2608b78dfa383c6a175ec36d39a28f4e2889  /usr/bin/yes
+9fe71e506ad02f545b55fba003f6fdf91adb28471fc3081fd49100073e51e018  /usr/bin/ls
+810d4df22304510caaad4dd509c2c2cb64d178968225b35b202b68b12a615b92  /usr/bin/md5sum
+d835574ad35558c5d6e0a4c7b3a9bc58a1606197f0aadd05394e20826eea54f8  /usr/bin/mv
+ba8eb6d460b6ce59fb8b577ad037896b909e065d27e05759c29378f9224bc03c  /usr/bin/rm
+ba3f5825fca079b7dafd32f128d1793831e6fe6c36892eb72413a996399eaf8b  /usr/bin/sha1sum
diff --git a/sysa/gzip-1.2.4/checksums b/sysa/gzip-1.2.4/checksums
index 90c6461..ed26195 100644
--- a/sysa/gzip-1.2.4/checksums
+++ b/sysa/gzip-1.2.4/checksums
@@ -1 +1 @@
-062e34d3f2d4bcb339ce3be80a1b6bc0ff805d70c8c13d9a6ad6e7a93914a1bf  /usr/bin/gzip
+3a0753ea8effb449d19d0fef091cabe27a937dc8545d1dd9fe28cd2991e846e8  /usr/bin/gzip
diff --git a/sysa/heirloom-devtools-070527/checksums b/sysa/heirloom-devtools-070527/checksums
index 070de47..e8ff066 100644
--- a/sysa/heirloom-devtools-070527/checksums
+++ b/sysa/heirloom-devtools-070527/checksums
@@ -1,5 +1,5 @@
-d1a3da2e1199a8a11e97d5b2b201d49452be4403c37b5af070c1001cf0a932a2  /usr/bin/yacc
-fe3bf155e60efebc7a4018bf55e228ee7b98b2c9da0588a8c89fd358b1530a66  /usr/bin/lex
+c0193310d724442088711fd3ed8343b3c0632ea1d1caf18db173ec51a0a8fd88  /usr/bin/yacc
+7f8f379845182bd461e12da06ec0627d1ec1da4e2dd9ce9e975d88c00416b607  /usr/bin/lex
 ffe696afc1bda32a5f4035e29b3275cab73a27df7635ccbe02ed49a30374ccdd  /usr/lib/mes/libl.a
 bf3fb293f1ff89ee3dbcb08166c64b7a6793b49a12673d7633e3353ebea80d4d  /yaccpar
 ee0f187b844f50d64c912bfcb5d73706662846d6d8a90b8b1fb20dda60464734  /lex/ncform
diff --git a/sysa/helpers.sh b/sysa/helpers.sh
index 447a7fa..67168ce 100755
--- a/sysa/helpers.sh
+++ b/sysa/helpers.sh
@@ -112,18 +112,17 @@ _grep() {
 # build takes three arguments:
 # 1) name-version of the package
 # 2) optionally specify build script. Default is name-version.sh
-# 3) optionally specify name of checksum file. Default is checksums
-# 4) directory of patches. Default is patches
-# 5) directory to cd into. Default is ${pkg}
+# 3) directory of patches. Default is patches
+# 4) directory to cd into. Default is ${pkg}
 build() {
     pkg=$1
     script_name=${2:-${pkg}.sh}
-    dirname=${5:-${pkg}}
+    dirname=${4:-${pkg}}
 
     cd "${SOURCES}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$)
     echo "${pkg}: beginning build using script ${script_name}"
     base_dir="${PWD}"
-    patch_dir="${base_dir}/${4:-patches}"
+    patch_dir="${base_dir}/${3:-patches}"
     mk_dir="${base_dir}/mk"
     files_dir="${base_dir}/files"
 
diff --git a/sysa/make-3.80/checksums b/sysa/make-3.80/checksums
index c247293..747c3b0 100644
--- a/sysa/make-3.80/checksums
+++ b/sysa/make-3.80/checksums
@@ -1 +1 @@
-28627851f50c7337e145bd2677e95bcc1abbe2b9ee784da19f49df700b2c6ac2  /usr/bin/make
+2cbe8a7a5307a0f6bbec9afdc14611ff2cadfdc27ee99423cf664d40b05644d8  /usr/bin/make
diff --git a/sysa/mes-0.23/mes-libc-0.23.sh b/sysa/mes-0.23/mes-libc-0.23.sh
deleted file mode 100755
index acab0f1..0000000
--- a/sysa/mes-0.23/mes-libc-0.23.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_compile() {
-    FILES="ctype/isalnum.c ctype/isalpha.c ctype/isascii.c ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \
-        ctype/islower.c ctype/isnumber.c ctype/isprint.c ctype/ispunct.c ctype/isspace.c ctype/isupper.c ctype/isxdigit.c \
-        ctype/tolower.c ctype/toupper.c \
-        dirent/closedir.c dirent/__getdirentries.c dirent/opendir.c dirent/readdir.c \
-        linux/access.c linux/brk.c linux/chdir.c linux/chmod.c linux/clock_gettime.c linux/close.c linux/dup2.c \
-        linux/dup.c linux/execve.c linux/fcntl.c linux/fork.c linux/fsync.c linux/fstat.c linux/_getcwd.c \
-        linux/getdents.c linux/getegid.c linux/geteuid.c linux/getgid.c linux/getpid.c linux/getppid.c \
-        linux/getrusage.c linux/gettimeofday.c linux/getuid.c linux/ioctl.c linux/kill.c linux/link.c linux/lseek.c \
-        linux/lstat.c linux/mkdir.c linux/mknod.c linux/nanosleep.c linux/_open3.c linux/pipe.c linux/_read.c \
-        linux/readlink.c linux/rename.c linux/rmdir.c linux/setgid.c linux/settimer.c linux/setuid.c linux/signal.c \
-        linux/sigprogmask.c linux/symlink.c linux/stat.c linux/time.c linux/unlink.c linux/waitpid.c \
-        linux/x86-mes-gcc/_exit.c linux/x86-mes-gcc/syscall.c linux/x86-mes-gcc/_write.c \
-        math/ceil.c math/fabs.c math/floor.c mes/abtod.c mes/abtol.c mes/__assert_fail.c mes/__buffered_read.c \
-        mes/dtoab.c mes/eputc.c mes/eputs.c mes/fdgetc.c mes/fdgets.c mes/fdputc.c mes/fdputs.c mes/fdungetc.c \
-        mes/globals.c mes/itoa.c mes/ltoab.c mes/ltoa.c mes/__mes_debug.c mes/mes_open.c mes/ntoab.c mes/oputc.c \
-        mes/oputs.c mes/search-path.c mes/ultoa.c mes/utoa.c \
-        posix/alarm.c posix/buffered-read.c posix/execl.c posix/execlp.c posix/execv.c posix/execvp.c posix/getcwd.c \
-        posix/getenv.c posix/isatty.c posix/mktemp.c posix/open.c posix/raise.c posix/sbrk.c posix/setenv.c \
-        posix/sleep.c posix/unsetenv.c posix/wait.c posix/write.c \
-        stdio/clearerr.c stdio/fclose.c stdio/fdopen.c stdio/feof.c stdio/ferror.c stdio/fflush.c stdio/fgetc.c \
-        stdio/fgets.c stdio/fileno.c stdio/fopen.c stdio/fprintf.c stdio/fputc.c stdio/fputs.c stdio/fread.c \
-        stdio/freopen.c stdio/fscanf.c stdio/fseek.c stdio/ftell.c stdio/fwrite.c stdio/getc.c stdio/getchar.c \
-        stdio/perror.c stdio/printf.c stdio/putc.c stdio/putchar.c stdio/remove.c stdio/snprintf.c stdio/sprintf.c \
-        stdio/sscanf.c stdio/ungetc.c stdio/vfprintf.c stdio/vfscanf.c stdio/vprintf.c stdio/vsnprintf.c \
-        stdio/vsprintf.c stdio/vsscanf.c stdlib/abort.c stdlib/abs.c stdlib/alloca.c stdlib/atexit.c stdlib/atof.c \
-        stdlib/atoi.c stdlib/atol.c stdlib/calloc.c stdlib/__exit.c stdlib/exit.c stdlib/free.c stdlib/malloc.c \
-        stdlib/mbstowcs.c stdlib/puts.c stdlib/qsort.c stdlib/realloc.c stdlib/strtod.c stdlib/strtof.c \
-        stdlib/strtol.c stdlib/strtold.c stdlib/strtoll.c stdlib/strtoul.c stdlib/strtoull.c string/bcmp.c \
-        string/bcopy.c string/bzero.c string/index.c string/memchr.c string/memcmp.c string/memcpy.c string/memmem.c \
-        string/memmove.c string/memset.c string/rindex.c string/strcat.c string/strchr.c string/strcmp.c \
-        string/strcpy.c string/strcspn.c string/strdup.c string/strerror.c string/strlen.c string/strlwr.c \
-        string/strncat.c string/strncmp.c string/strncpy.c string/strpbrk.c string/strrchr.c string/strspn.c \
-        string/strstr.c string/strupr.c \
-        stub/atan2.c stub/bsearch.c stub/chown.c stub/__cleanup.c stub/cos.c stub/ctime.c stub/exp.c stub/fpurge.c \
-        stub/freadahead.c stub/frexp.c stub/getgrgid.c stub/getgrnam.c stub/getlogin.c stub/getpgid.c stub/getpgrp.c \
-        stub/getpwnam.c stub/getpwuid.c stub/gmtime.c stub/ldexp.c stub/localtime.c stub/log.c stub/mktime.c \
-        stub/modf.c stub/mprotect.c stub/pclose.c stub/popen.c stub/pow.c stub/rand.c stub/rewind.c stub/setbuf.c \
-        stub/setgrent.c stub/setlocale.c stub/setvbuf.c stub/sigaction.c stub/sigaddset.c stub/sigblock.c \
-        stub/sigdelset.c stub/sigemptyset.c stub/sigsetmask.c stub/sin.c stub/sys_siglist.c stub/system.c stub/sqrt.c \
-        stub/strftime.c stub/times.c stub/ttyname.c stub/umask.c stub/utime.c x86-mes-gcc/setjmp.c"
-
-    CFLAGS="-D HAVE_CONFIG_H=1 -I include -I include/linux/x86"
-
-    for f in $FILES; do
-        tcc ${CFLAGS} -c "lib/${f}"
-    done
-    # libc.a
-    tcc -ar cr libc.a *.o
-
-    # crt{1,n,i}.o
-    tcc ${CFLAGS} -c lib/linux/x86-mes-gcc/crt1.c
-    tcc ${CFLAGS} -c lib/linux/x86-mes-gcc/crtn.c
-    tcc ${CFLAGS} -c lib/linux/x86-mes-gcc/crti.c
-
-    # libgetopt.a
-    tcc ${CFLAGS} -c lib/posix/getopt.c
-    tcc -ar cr libgetopt.a getopt.o
-}
-
-src_install() {
-    mkdir -p "${DESTDIR}${PREFIX}/lib/mes"
-    install -m 644 libc.a "${DESTDIR}${PREFIX}/lib/mes"
-    install -m 644 libgetopt.a "${DESTDIR}${PREFIX}/lib/mes"
-    install -m 644 crt1.o "${DESTDIR}${PREFIX}/lib/mes"
-    install -m 644 crtn.o "${DESTDIR}${PREFIX}/lib/mes"
-    install -m 644 crti.o "${DESTDIR}${PREFIX}/lib/mes"
-}
diff --git a/sysa/mes-0.23/patches/crt1.patch b/sysa/mes-0.23/patches/crt1.patch
deleted file mode 100644
index 9a066cb..0000000
--- a/sysa/mes-0.23/patches/crt1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-
-SPDX-License-Identifier: LGPL-2.0-or-later
-
-Fix issue in mes-libc crt where argc was getting truncated to lower byte and
-prevented programs with more than 255 arguments from working correctly. 
-
---- lib/linux/x86-mes-gcc/crt1.c
-+++ lib/linux/x86-mes-gcc/crt1.c
-@@ -48,7 +48,7 @@ _start ()
-   asm (
-        "mov     %%ebp,%%eax\n\t"
-        "add     $4,%%eax\n\t"
--       "movzbl  (%%eax),%%eax\n\t"
-+       "mov     (%%eax),%%eax\n\t"
-        "add     $3,%%eax\n\t"
-        "shl     $2,%%eax\n\t"
-        "add     %%ebp,%%eax\n\t"
-@@ -64,7 +64,7 @@ _start ()
- 
-        "mov     %ebp,%eax\n\t"
-        "add     $4,%eax\n\t"
--       "movzbl  (%eax),%eax\n\t"
-+       "mov     (%eax),%eax\n\t"
-        "push    %eax\n\t"
- 
-        "call    main\n\t"
diff --git a/sysa/mes/checksums b/sysa/mes-0.24/checksums
similarity index 54%
rename from sysa/mes/checksums
rename to sysa/mes-0.24/checksums
index 0abc5e4..f626fc1 100644
--- a/sysa/mes/checksums
+++ b/sysa/mes-0.24/checksums
@@ -1,13 +1,14 @@
-61595f43c1b8e1e952c7c24a08df9fb5e429f5f65eb6f9f0c3a03f854bc247de  /usr/bin/mes-m2
-2337a7eb4431ad2e9161e82d0ff918e0821f56ee27469d8d18d3d7dbbcc99dc3  /usr/bin/mescc.scm
-90811dafd33ad56b8e4b0adcc04263f9329b9047b7cc337abe8151a75017172c  /usr/lib/x86-mes/crt1.s
-e065af5f73d40b20029e9ba23143660f99c6abacb82d1b4c8f2067a4e395d553  /usr/lib/x86-mes/crt1.o
+91dd76ac703e0d5a3937b92c0c74ec04f0875b34ac2464f8247c311c5a119df5  /usr/bin/mes
+c1ff91e220a80654e6d1f9d7c7fede6a00df5c701192e16a9d98f5f265f393d1  /usr/bin/mes-m2
+0c7738c6640e7f3f2256c271a0eefa438fee6ffa043e756edc007e166bed48f5  /usr/bin/mescc.scm
+4feafab424611c976dc4628aa862e37b4e92b5869aebbcf7655e684c3f589041  /usr/lib/x86-mes/crt1.s
+69e9ec2ee2ebf065575cdaf878629178b85330257dde0da790a428c0280d1ecb  /usr/lib/x86-mes/crt1.o
 c9944a799d584abfa76f385c14ac0caf6f46d03b34bf2712493602b12826c6b2  /usr/lib/x86-mes/x86.M1
 d8646707db6aa2a76fdc5dbb3521376439e357f9f1de1d67f02a1afeefd342ac  /usr/lib/x86-mes/libmescc.s
-aaf89a9d6818cdb8ece73454631b1a1ae83503e5eb7777d38cdaf141cba0e530  /usr/lib/x86-mes/libc+tcc.s
-b5ce4e1288a27864156d74268090c13aea6b5a261fa81c75bfbe844d0689d03d  /usr/lib/x86-mes/libc.s
+142c62539fbe23d6259a85c8737269221893abeee0d4111d652e99c77233d23e  /usr/lib/x86-mes/libc+tcc.s
+3b8f49d1b89b0b81277441fa2025cb32314ee77b3e600fdcf6dabf6774302920  /usr/lib/x86-mes/libc.s
 52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /usr/lib/x86-mes/libmescc.a
-3156e619dbd85c471e2a8d053ba536eaaa8f91da657003777b8e87e7bab4266d  /usr/lib/x86-mes/libc+tcc.a
-400615ca47339a3149680748b319f089ca5cb7ff2fdb42cce252f8c408445c1b  /usr/lib/x86-mes/libc.a
+71f72993f8be8447dfc8e138182632fb82313d9ea1219b9640212263cf8662f4  /usr/lib/x86-mes/libc+tcc.a
+2df970d2b4c98077be61d38c5abcde456043e024efe5945932f9d40353f18fc7  /usr/lib/x86-mes/libc.a
 b16ab368bc4c7b8bd896d03cba565a60e97760dea4da9f5c8a1a3d2902a79df6  /usr/lib/linux/x86-mes/elf32-header.hex2
 f9873d9aab12e70f24d97f8319e17a1e698ca60779ae9a6ab3ede648cd60fc61  /usr/lib/linux/x86-mes/elf32-footer-single-main.hex2
diff --git a/sysa/mes/files/config.h b/sysa/mes-0.24/files/config.h
similarity index 87%
rename from sysa/mes/files/config.h
rename to sysa/mes-0.24/files/config.h
index 9fadf1b..f520d2f 100644
--- a/sysa/mes/files/config.h
+++ b/sysa/mes-0.24/files/config.h
@@ -4,4 +4,4 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #undef SYSTEM_LIBC
-#define MES_VERSION "0.22-m2"
+#define MES_VERSION "0.24"
diff --git a/sysa/mes/files/mescc.scm b/sysa/mes-0.24/files/mescc.scm
similarity index 96%
rename from sysa/mes/files/mescc.scm
rename to sysa/mes-0.24/files/mescc.scm
index daf6f66..8134094 100755
--- a/sysa/mes/files/mescc.scm
+++ b/sysa/mes-0.24/files/mescc.scm
@@ -23,7 +23,7 @@
 (define %libdir (or (getenv "libdir")
                     (string-append %prefix "/lib")))
 
-(define %version (if (string-prefix? "@VERSION" "0.22-m2") "git"
+(define %version (if (string-prefix? "@VERSION" "0.24") "git"
                      "0.22"))
 
 (define %arch (if (string-prefix? "@mes_cpu" "x86") %arch
diff --git a/sysa/mes/mes.kaem b/sysa/mes-0.24/mes-0.24.kaem
similarity index 92%
rename from sysa/mes/mes.kaem
rename to sysa/mes-0.24/mes-0.24.kaem
index 19e30d7..ab72202 100755
--- a/sysa/mes/mes.kaem
+++ b/sysa/mes-0.24/mes-0.24.kaem
@@ -40,11 +40,12 @@ cp mes/module/srfi/srfi-9/gnu-struct.mes mes/module/srfi/srfi-9/gnu.mes
 
 # Build mes-m2
 mkdir bin m2
-kaem --verbose --strict --file kaem.${ARCH}
+#kaem --verbose --strict --file kaem.${ARCH} # Restore once mes adds arch specific kaem files
+kaem --verbose --strict --file kaem.run
 cp bin/mes-m2 ${bindir}/mes-m2
 chmod 755 ${bindir}/mes-m2
 
-# Build Mes C library using mes-m2 bootstrapped Mes
+# Recompile Mes and Mes C library using mes-m2 bootstrapped Mes
 
 alias mescc="${MES} -e main ${bindir}/mescc.scm -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -c"
 
@@ -113,7 +114,6 @@ mescc lib/stdio/putc.c
 mescc lib/stdio/putchar.c
 mescc lib/stdio/ungetc.c
 mescc lib/stdlib/free.c
-mescc lib/stdlib/malloc.c
 mescc lib/stdlib/realloc.c
 mescc lib/string/memchr.c
 mescc lib/string/memcmp.c
@@ -136,6 +136,7 @@ mescc lib/linux/fsync.c
 mescc lib/linux/_getcwd.c
 mescc lib/linux/gettimeofday.c
 mescc lib/linux/ioctl3.c
+mescc lib/linux/malloc.c
 mescc lib/linux/_open3.c
 mescc lib/linux/_read.c
 mescc lib/linux/time.c
@@ -205,6 +206,30 @@ mescc lib/linux/stat.c
 catm ${libdir}/x86-mes/libc+tcc.a ${libdir}/x86-mes/libc.a islower.o isupper.o tolower.o toupper.o abtod.o dtoab.o search-path.o execvp.o fclose.o fdopen.o ferror.o fflush.o fopen.o fprintf.o fread.o fseek.o ftell.o fwrite.o printf.o remove.o snprintf.o sprintf.o sscanf.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o vsscanf.o calloc.o qsort.o strtod.o strtof.o strtol.o strtold.o strtoll.o strtoul.o strtoull.o memmem.o strcat.o strchr.o strlwr.o strncpy.o strrchr.o strstr.o strupr.o sigaction.o ldexp.o mprotect.o localtime.o sigemptyset.o setjmp.o close.o rmdir.o stat.o
 catm ${libdir}/x86-mes/libc+tcc.s ${libdir}/x86-mes/libc.s islower.s isupper.s tolower.s toupper.s abtod.s dtoab.s search-path.s execvp.s fclose.s fdopen.s ferror.s fflush.s fopen.s fprintf.s fread.s fseek.s ftell.s fwrite.s printf.s remove.s snprintf.s sprintf.s sscanf.s vfprintf.s vprintf.s vsnprintf.s vsprintf.s vsscanf.s calloc.s qsort.s strtod.s strtof.s strtol.s strtold.s strtoll.s strtoul.s strtoull.s memmem.s strcat.s strchr.s strlwr.s strncpy.s strrchr.s strstr.s strupr.s sigaction.s ldexp.s mprotect.s localtime.s sigemptyset.s setjmp.s close.s rmdir.s stat.s
 
+# Build mes itself
+mescc src/builtins.c
+mescc src/cc.c
+mescc src/core.c
+mescc src/display.c
+mescc src/eval-apply.c
+mescc src/gc.c
+mescc src/globals.c
+mescc src/hash.c
+mescc src/lib.c
+mescc src/math.c
+mescc src/mes.c
+mescc src/module.c
+mescc src/posix.c
+mescc src/reader.c
+mescc src/stack.c
+mescc src/string.c
+mescc src/struct.c
+mescc src/symbol.c
+mescc src/vector.c
+
+# Link everything into new mes executable
+${MES} -e main ${bindir}/mescc.scm -- -L ${libdir} -nostdlib -o ${bindir}/mes -L . crt1.o builtins.o cc.o core.o display.o eval-apply.o gc.o globals.o hash.o lib.o math.o mes.o module.o posix.o reader.o stack.o string.o struct.o symbol.o vector.o -lc -lmescc
+
 # Make directories
 mkdir ${prefix}/lib/linux ${incdir}/mes ${incdir}/sys ${incdir}/linux
 mkdir ${prefix}/lib/x86-mes ${prefix}/lib/linux/x86-mes ${incdir}/linux/x86
diff --git a/sysa/patch-2.5.9/checksums b/sysa/patch-2.5.9/checksums
index 39a2bde..5d2e14c 100644
--- a/sysa/patch-2.5.9/checksums
+++ b/sysa/patch-2.5.9/checksums
@@ -1 +1 @@
-b229f2fcab31c1b01012cf30f397fc013cdd6404cb5cbb134aba9dfb745cbed6  /usr/bin/patch
+79de85fdf5a3747550759998fd1bd43e14a2b8c4db49149edd5609d9dc76e492  /usr/bin/patch
diff --git a/sysa/run.sh b/sysa/run.sh
index 82ff178..d7b649c 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -105,42 +105,37 @@ mkdir -p "${DESTDIR}" "${REPO}" /dev
 
 build flex-2.5.11
 
-# Patch meslibc to support > 255 command line arguments
-build mes-0.23 mes-libc-0.23.sh
-
-build tcc-0.9.27 tcc-meslibc-rebuild.sh checksums/tcc-meslibc-rebuild
-
-build musl-1.1.24 "" checksums/pass1
+build musl-1.1.24
 
 # Rebuild tcc using musl
-build tcc-0.9.27 tcc-musl-pass1.sh checksums/tcc-musl-pass1
+build tcc-0.9.27 tcc-musl-pass1.sh
 
 # Rebuild musl using tcc-musl
-build musl-1.1.24 "" checksums/pass2
+build musl-1.1.24
 
 # Rebuild tcc-musl using new musl
-build tcc-0.9.27 tcc-musl-pass2.sh checksums/tcc-musl-pass2
+build tcc-0.9.27 tcc-musl-pass2.sh
 
 # Rebuild sed using musl
-build sed-4.0.9 sed-4.0.9.sh checksums/pass2
+build sed-4.0.9 sed-4.0.9.sh
 
 # Rebuild bzip2 using musl
-build bzip2-1.0.8 bzip2-1.0.8.sh checksums/bzip2-pass2
+build bzip2-1.0.8 bzip2-1.0.8.sh
 
 build m4-1.4.7
 
 build flex-2.6.4
 
-build bison-3.4.1 stage1.sh checksums/stage1
-build bison-3.4.1 stage2.sh checksums/stage2
-build bison-3.4.1 stage3.sh checksums/stage3
+build bison-3.4.1 stage1.sh
+build bison-3.4.1 stage2.sh
+build bison-3.4.1 stage3.sh
 
 build grep-2.4
 
 build diffutils-2.7
 
 # Rebuild coreutils using musl
-build coreutils-5.0 coreutils-5.0.sh checksums/pass2
+build coreutils-5.0 coreutils-5.0.sh
 
 # Build only date, mktemp and sha256sum
 build coreutils-6.10
@@ -151,9 +146,9 @@ build perl-5.000
 
 build perl-5.003
 
-build perl5.004-05 '' '' '' perl5.004_05
+build perl5.004-05 '' '' perl5.004_05
 
-build perl5.005-03 '' '' '' perl5.005_03
+build perl5.005-03 '' '' perl5.005_03
 
 build perl-5.6.2
 
@@ -178,11 +173,12 @@ build libtool-1.4
 build binutils-2.14
 
 # Build musl with fewer patches
-build musl-1.1.24 binutils-rebuild.sh checksums/pass3 patches-pass3
-populate_device_nodes
+build musl-1.1.24 binutils-rebuild.sh patches-pass3
 
 # Rebuild tcc-musl using new musl
-build tcc-0.9.27 tcc-musl-pass3.sh checksums/tcc-musl-pass3 patches-musl-pass3
+build tcc-0.9.27 tcc-musl-pass3.sh patches-musl-pass3
+
+populate_device_nodes
 
 build autoconf-2.53 stage1.sh
 build autoconf-2.53 stage2.sh
@@ -220,16 +216,16 @@ build automake-1.10.3
 
 build autoconf-2.64
 
-build gcc-4.0.4 pass1.sh checksums/pass1
+build gcc-4.0.4 pass1.sh
 
 # This hack fixes a strange bug in mes libc bash
 set -x
-build linux-headers-5.10.41 '' '' '' linux-5.10.41
+build linux-headers-5.10.41 '' '' linux-5.10.41
 set +x
 
 build musl-1.2.2
 
-build gcc-4.0.4 pass2.sh checksums/pass2
+build gcc-4.0.4 pass2.sh
 
 build util-linux-2.19.1
 
diff --git a/sysa/sed-4.0.9/checksums b/sysa/sed-4.0.9/checksums
index e01adc1..f085395 100644
--- a/sysa/sed-4.0.9/checksums
+++ b/sysa/sed-4.0.9/checksums
@@ -1 +1 @@
-a29789a4a0150cbc7ed718ece238cad4c3863c794c8825f0743bc6cf1838b4a8  /usr/bin/sed
+19140fdea18e2d8f3ed1597f7d0d72baa7b2c3b69bf87edc35271df2da24bbfb  /usr/bin/sed
diff --git a/sysa/tar-1.12/checksums b/sysa/tar-1.12/checksums
index 74af9f1..57b6454 100644
--- a/sysa/tar-1.12/checksums
+++ b/sysa/tar-1.12/checksums
@@ -1 +1 @@
-efde53cec77c2e0efb0cd2f747c4d649ffd16c12c69bf2dd42b6bf14926323a1  /usr/bin/tar
+3b4845de1d50b839a7aa4ef4a188a5f97ce0d0c36f16c1cc787d164ae0dd04d3  /usr/bin/tar
diff --git a/sysa/tcc-0.9.26/checksums b/sysa/tcc-0.9.26/checksums
index a443bff..1e252d4 100644
--- a/sysa/tcc-0.9.26/checksums
+++ b/sysa/tcc-0.9.26/checksums
@@ -1,13 +1,13 @@
-ea96f7ad93ee4f7ed33b45b5055dbd95280a7fb315d8a205c703b55d1fe127ca  /usr/bin/mes-tcc
-fbf055522c51b6b4f5359beb937d404d0c17b43f892d4725c5a13208d3e24ae3  /usr/bin/boot0-tcc
-a0a91baa0194f6bebb658f041d6ae786b9aea002b5dc8b2b21fa725f81b31259  /usr/bin/boot1-tcc
-93e7a2530dba4955c3cea9f57f156e6368a2b5febc56855e1b277c46326a917e  /usr/bin/boot2-tcc
-9e7c8043fb42994faa255b14e3bb0d1fc44289a8567370baef5b455fa4b85e4c  /usr/bin/boot3-tcc
-d7301f314697d6783f5b8b1a969160ee7628ccbb477193ab746adffeb4a85855  /usr/bin/boot4-tcc
-9ae8d5f4986c6375a705bd3e56aad26150c0a7a89421fc47c4343f5cf25a7a8d  /usr/bin/tcc
-37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581  /usr/lib/mes/libc.a
+410dcb5ff6265d3d5b5014ae7be8633b42b37d9c58ebab531bae0d2f8f40c920  /usr/bin/mes-tcc
+d6daf3a4ad7ddd5a1fd4b84df6111b21d54897f777ec857872aa3c2ccb96473f  /usr/bin/boot0-tcc
+eb3f6513e1dc63db901ac9b788d0b87046f1cd4237f5cbbb94b6faf4cda2e3c6  /usr/bin/boot1-tcc
+cc6a1bb2abb961bb793304ae4ddd48fee2d0b088f5226029eb7562cbd542e6d7  /usr/bin/boot2-tcc
+97973e9b2a54a1f1894fd77126a51229f32cc5e70fe6dbad647b48fbb49c7adc  /usr/bin/boot3-tcc
+b2ecb7d08dfc54ac3b5d074ab36f47269922d4732f49df3c3f98b2009c2109fa  /usr/bin/boot4-tcc
+0a0d231864ae219d85486b7f6e0e603cc7543eaaafa161870aba55dfb6fe55ee  /usr/bin/tcc
+9c92fbd20e837e634b854899bf89fdcee8a34d93dfbf073d7b2eeddd1a2d6916  /usr/lib/mes/libc.a
 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
-44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /usr/lib/mes/crt1.o
+d1168ee9b528e39f0b40e8d51fb7fa3619c4a5ee928137f7faf6d0879b0916b0  /usr/lib/mes/crt1.o
 09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /usr/lib/mes/crti.o
 461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /usr/lib/mes/crtn.o
 ac11f09698f092ed76ae40ebcd56cf3f2b903ea1333ef7537a00673dd6f73da7  /usr/lib/mes/tcc/libtcc1.a
diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
index d1556c3..9975b1c 100755
--- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem
+++ b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
@@ -12,26 +12,24 @@ MES_ARENA=30000000
 MES_MAX_ARENA=30000000
 MES_LIB=${MES_PREFIX}/lib
 MES_SOURCE=${MES_PREFIX}
-MES=${bindir}/mes-m2
+MES=${bindir}/mes
 
 TCC_TAR=tcc-0.9.26
 TCC_PKG=tcc-0.9.26-1136-g5bba73cc
 
-MES_PKG=mes-0.23
-
 # Unpack
 mkdir src build
 cp ${distfiles}/${TCC_TAR}.tar.gz src
-cp ${distfiles}/mes-0.23.tar.gz src
+cp ${distfiles}/${MES_PKG}.tar.gz src
 
 cd src
 ungz ${TCC_TAR}.tar.gz
-ungz mes-0.23.tar.gz
+ungz ${MES_PKG}.tar.gz
 cd ..
 
 cd build
 untar ../src/${TCC_TAR}.tar
-untar ../src/mes-0.23.tar
+untar ../src/${MES_PKG}.tar
 
 # Create config.h
 cd ${TCC_PKG}
@@ -79,7 +77,7 @@ cd ../${MES_PKG}
 
 # Create unified libc file
 cd lib
-catm ../unified-libc.c ctype/isalnum.c ctype/isalpha.c ctype/isascii.c ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c ctype/islower.c ctype/isnumber.c ctype/isprint.c ctype/ispunct.c ctype/isspace.c ctype/isupper.c ctype/isxdigit.c ctype/tolower.c ctype/toupper.c dirent/closedir.c dirent/__getdirentries.c dirent/opendir.c dirent/readdir.c linux/access.c linux/brk.c linux/chdir.c linux/chmod.c linux/clock_gettime.c linux/close.c linux/dup2.c linux/dup.c linux/execve.c linux/fcntl.c linux/fork.c linux/fsync.c linux/fstat.c linux/_getcwd.c linux/getdents.c linux/getegid.c linux/geteuid.c linux/getgid.c linux/getpid.c linux/getppid.c linux/getrusage.c linux/gettimeofday.c linux/getuid.c linux/ioctl.c linux/kill.c linux/link.c linux/lseek.c linux/lstat.c linux/mkdir.c linux/mknod.c linux/nanosleep.c linux/_open3.c linux/pipe.c linux/_read.c linux/readlink.c linux/rename.c linux/rmdir.c linux/setgid.c linux/settimer.c linux/setuid.c linux/signal.c linux/sigprogmask.c linux/symlink.c linux/stat.c linux/time.c linux/unlink.c linux/waitpid.c linux/x86-mes-gcc/_exit.c linux/x86-mes-gcc/syscall.c linux/x86-mes-gcc/_write.c math/ceil.c math/fabs.c math/floor.c mes/abtod.c mes/abtol.c mes/__assert_fail.c mes/__buffered_read.c mes/dtoab.c mes/eputc.c mes/eputs.c mes/fdgetc.c mes/fdgets.c mes/fdputc.c mes/fdputs.c mes/fdungetc.c mes/globals.c mes/itoa.c mes/ltoab.c mes/ltoa.c mes/__mes_debug.c mes/mes_open.c mes/ntoab.c mes/oputc.c mes/oputs.c mes/search-path.c mes/ultoa.c mes/utoa.c posix/alarm.c posix/buffered-read.c posix/execl.c posix/execlp.c posix/execv.c posix/execvp.c posix/getcwd.c posix/getenv.c posix/isatty.c posix/mktemp.c posix/open.c posix/raise.c posix/sbrk.c posix/setenv.c posix/sleep.c posix/unsetenv.c posix/wait.c posix/write.c stdio/clearerr.c stdio/fclose.c stdio/fdopen.c stdio/feof.c stdio/ferror.c stdio/fflush.c stdio/fgetc.c stdio/fgets.c stdio/fileno.c stdio/fopen.c stdio/fprintf.c stdio/fputc.c stdio/fputs.c stdio/fread.c stdio/freopen.c stdio/fscanf.c stdio/fseek.c stdio/ftell.c stdio/fwrite.c stdio/getc.c stdio/getchar.c stdio/perror.c stdio/printf.c stdio/putc.c stdio/putchar.c stdio/remove.c stdio/snprintf.c stdio/sprintf.c stdio/sscanf.c stdio/ungetc.c stdio/vfprintf.c stdio/vfscanf.c stdio/vprintf.c stdio/vsnprintf.c stdio/vsprintf.c stdio/vsscanf.c stdlib/abort.c stdlib/abs.c stdlib/alloca.c stdlib/atexit.c stdlib/atof.c stdlib/atoi.c stdlib/atol.c stdlib/calloc.c stdlib/__exit.c stdlib/exit.c stdlib/free.c stdlib/malloc.c stdlib/mbstowcs.c stdlib/puts.c stdlib/qsort.c stdlib/realloc.c stdlib/strtod.c stdlib/strtof.c stdlib/strtol.c stdlib/strtold.c stdlib/strtoll.c stdlib/strtoul.c stdlib/strtoull.c string/bcmp.c string/bcopy.c string/bzero.c string/index.c string/memchr.c string/memcmp.c string/memcpy.c string/memmem.c string/memmove.c string/memset.c string/rindex.c string/strcat.c string/strchr.c string/strcmp.c string/strcpy.c string/strcspn.c string/strdup.c string/strerror.c string/strlen.c string/strlwr.c string/strncat.c string/strncmp.c string/strncpy.c string/strpbrk.c string/strrchr.c string/strspn.c string/strstr.c string/strupr.c stub/atan2.c stub/bsearch.c stub/chown.c stub/__cleanup.c stub/cos.c stub/ctime.c stub/exp.c stub/fpurge.c stub/freadahead.c stub/frexp.c stub/getgrgid.c stub/getgrnam.c stub/getlogin.c stub/getpgid.c stub/getpgrp.c stub/getpwnam.c stub/getpwuid.c stub/gmtime.c stub/ldexp.c stub/localtime.c stub/log.c stub/mktime.c stub/modf.c stub/mprotect.c stub/pclose.c stub/popen.c stub/pow.c stub/rand.c stub/rewind.c stub/setbuf.c stub/setgrent.c stub/setlocale.c stub/setvbuf.c stub/sigaction.c stub/sigaddset.c stub/sigblock.c stub/sigdelset.c stub/sigemptyset.c stub/sigsetmask.c stub/sin.c stub/sys_siglist.c stub/system.c stub/sqrt.c stub/strftime.c stub/times.c stub/ttyname.c stub/umask.c stub/utime.c x86-mes-gcc/setjmp.c
+catm ../unified-libc.c ctype/isalnum.c ctype/isalpha.c ctype/isascii.c ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c ctype/islower.c ctype/isnumber.c ctype/isprint.c ctype/ispunct.c ctype/isspace.c ctype/isupper.c ctype/isxdigit.c ctype/tolower.c ctype/toupper.c dirent/closedir.c dirent/__getdirentries.c dirent/opendir.c dirent/readdir.c linux/access.c linux/brk.c linux/chdir.c linux/chmod.c linux/clock_gettime.c linux/close.c linux/dup2.c linux/dup.c linux/execve.c linux/fcntl.c linux/fork.c linux/fsync.c linux/fstat.c linux/_getcwd.c linux/getdents.c linux/getegid.c linux/geteuid.c linux/getgid.c linux/getpid.c linux/getppid.c linux/getrusage.c linux/gettimeofday.c linux/getuid.c linux/ioctl.c linux/ioctl3.c linux/kill.c linux/link.c linux/lseek.c linux/lstat.c linux/malloc.c linux/mkdir.c linux/mknod.c linux/nanosleep.c linux/_open3.c linux/pipe.c linux/_read.c linux/readlink.c linux/rename.c linux/rmdir.c linux/setgid.c linux/settimer.c linux/setuid.c linux/signal.c linux/sigprogmask.c linux/symlink.c linux/stat.c linux/time.c linux/unlink.c linux/waitpid.c linux/x86-mes-gcc/_exit.c linux/x86-mes-gcc/syscall.c linux/x86-mes-gcc/_write.c math/ceil.c math/fabs.c math/floor.c mes/abtod.c mes/abtol.c mes/__assert_fail.c mes/assert_msg.c mes/__buffered_read.c mes/cast.c mes/dtoab.c mes/eputc.c mes/eputs.c mes/fdgetc.c mes/fdgets.c mes/fdputc.c mes/fdputs.c mes/fdungetc.c mes/globals.c mes/itoa.c mes/ltoab.c mes/ltoa.c mes/__mes_debug.c mes/mes_open.c mes/ntoab.c mes/oputc.c mes/oputs.c mes/search-path.c mes/ultoa.c mes/utoa.c posix/alarm.c posix/buffered-read.c posix/execl.c posix/execlp.c posix/execv.c posix/execvp.c posix/getcwd.c posix/getenv.c posix/isatty.c posix/mktemp.c posix/open.c posix/raise.c posix/sbrk.c posix/setenv.c posix/sleep.c posix/unsetenv.c posix/wait.c posix/write.c stdio/clearerr.c stdio/fclose.c stdio/fdopen.c stdio/feof.c stdio/ferror.c stdio/fflush.c stdio/fgetc.c stdio/fgets.c stdio/fileno.c stdio/fopen.c stdio/fprintf.c stdio/fputc.c stdio/fputs.c stdio/fread.c stdio/freopen.c stdio/fscanf.c stdio/fseek.c stdio/ftell.c stdio/fwrite.c stdio/getc.c stdio/getchar.c stdio/perror.c stdio/printf.c stdio/putc.c stdio/putchar.c stdio/remove.c stdio/snprintf.c stdio/sprintf.c stdio/sscanf.c stdio/ungetc.c stdio/vfprintf.c stdio/vfscanf.c stdio/vprintf.c stdio/vsnprintf.c stdio/vsprintf.c stdio/vsscanf.c stdlib/abort.c stdlib/abs.c stdlib/alloca.c stdlib/atexit.c stdlib/atof.c stdlib/atoi.c stdlib/atol.c stdlib/calloc.c stdlib/__exit.c stdlib/exit.c stdlib/free.c stdlib/mbstowcs.c stdlib/puts.c stdlib/qsort.c stdlib/realloc.c stdlib/strtod.c stdlib/strtof.c stdlib/strtol.c stdlib/strtold.c stdlib/strtoll.c stdlib/strtoul.c stdlib/strtoull.c string/bcmp.c string/bcopy.c string/bzero.c string/index.c string/memchr.c string/memcmp.c string/memcpy.c string/memmem.c string/memmove.c string/memset.c string/rindex.c string/strcat.c string/strchr.c string/strcmp.c string/strcpy.c string/strcspn.c string/strdup.c string/strerror.c string/strlen.c string/strlwr.c string/strncat.c string/strncmp.c string/strncpy.c string/strpbrk.c string/strrchr.c string/strspn.c string/strstr.c string/strupr.c stub/atan2.c stub/bsearch.c stub/chown.c stub/__cleanup.c stub/cos.c stub/ctime.c stub/exp.c stub/fpurge.c stub/freadahead.c stub/frexp.c stub/getgrgid.c stub/getgrnam.c stub/getlogin.c stub/getpgid.c stub/getpgrp.c stub/getpwnam.c stub/getpwuid.c stub/gmtime.c stub/ldexp.c stub/localtime.c stub/log.c stub/mktime.c stub/modf.c stub/mprotect.c stub/pclose.c stub/popen.c stub/pow.c stub/rand.c stub/rewind.c stub/setbuf.c stub/setgrent.c stub/setlocale.c stub/setvbuf.c stub/sigaction.c stub/sigaddset.c stub/sigblock.c stub/sigdelset.c stub/sigemptyset.c stub/sigsetmask.c stub/sin.c stub/sys_siglist.c stub/system.c stub/sqrt.c stub/strftime.c stub/times.c stub/ttyname.c stub/umask.c stub/utime.c x86-mes-gcc/setjmp.c
 cd ..
 
 # crt1.o
diff --git a/sysa/tcc-0.9.27/checksums b/sysa/tcc-0.9.27/checksums
index ac3230f..c8cd6d4 100644
--- a/sysa/tcc-0.9.27/checksums
+++ b/sysa/tcc-0.9.27/checksums
@@ -1 +1 @@
-287056807b7cd70ecded9201ef7afa0d71fb1cd1e4effc24e38aaf7580c5e442  /usr/bin/tcc
+b4961580bcce0ad05b69ffd700765d812461238362c9587e8c4ba5906077bd60  /usr/bin/tcc
diff --git a/sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch b/sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch
index e854f0d..6551f0f 100644
--- a/sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch
+++ b/sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch
@@ -13,7 +13,7 @@ we had to patch musl to replace weak symbols with strong symbols
 -#endif
                  tcc_error_noabort("'%s' defined twice", name);
 +#endif
-+		goto do_patch;
++                goto do_patch;
              }
          } else {
          do_patch:
diff --git a/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh b/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh
deleted file mode 100755
index 073e7e1..0000000
--- a/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    default
-
-    touch config.h
-}
-
-src_compile() {
-    export libdir=${PREFIX}/lib/mes
-    export incdir=${PREFIX}/include
-    export bindir=${PREFIX}/bin
-
-    mkdir -p ${libdir}/tcc
-
-    tcc-0.9.26 \
-        -v \
-        -o tcc \
-        -D TCC_TARGET_I386=1 \
-        -D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-        -D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
-        -D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
-        -D CONFIG_TCC_LIBPATHS=\"${libdir}:${libdir}/tcc\" \
-        -D CONFIG_TCC_SYSINCLUDEPATHS=\"${incdir}\" \
-        -D TCC_LIBGCC=\"${libdir}/libc.a\" \
-        -D CONFIG_TCC_STATIC=1 \
-        -D CONFIG_USE_LIBGCC=1 \
-        -D TCC_VERSION=\"0.9.27\" \
-        -D ONE_SOURCE=1 \
-        tcc.c
-}
-
-src_install() {
-    install -D tcc ${DESTDIR}${bindir}/tcc
-}
diff --git a/sysc/run2.sh b/sysc/run2.sh
index cc381aa..1b5d6b3 100755
--- a/sysc/run2.sh
+++ b/sysc/run2.sh
@@ -49,7 +49,7 @@ build bison-3.4.2
 
 build perl-5.10.1
 
-build dist-3.5-236 '' '' '' dist-d1de81f
+build dist-3.5-236 '' '' dist-d1de81f
 
 build perl-5.32.1