diff --git a/parts.rst b/parts.rst
index 66f11ea..9fdbc8d 100644
--- a/parts.rst
+++ b/parts.rst
@@ -164,7 +164,7 @@ 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 0.24
+mes 0.25
 ========
 
 GNU ``mes`` is a scheme interpreter. It runs the sister project ``mescc``,
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index c5309dd..9895db4 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -44,7 +44,7 @@ bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1  dist-3.5-236_0
 dd2bc9708213816b752ea40cd7ff4d5b89336be47b3c76b2aff683708f9dcbbc  ed-1.4_0.tar.bz2
 9a680b6aaabd7c301438579389c500cce72472af3d78d8ba8f88c99feb9cc721  file-5.44_0.tar.bz2
 5984d3f2d5513dd04dc97619e2809d634fc7e3692f36f770e0202a61b6b2921d  findutils-4.2.33_0.tar.bz2
-3c85ce52e37c313d699a21cc741d24e808048461b105f58445a645a54ea55436  flex-2.5.11_0.tar.bz2
+41902ec0383ea977a8d008dee37150e022e0714cd99f54c37f29c153464b758a  flex-2.5.11_0.tar.bz2
 b3a8d59229289ca5a1de6a24c9c828d2847144f6662e0d5b7f41e7ff6e57abaa  flex-2.5.33_0.tar.bz2
 408131b1c033a5f8a6845997b049784be0b466cec107a71270e5a04dae2c1e6c  flex-2.6.4_0.tar.bz2
 5ff7fbe16b55563719b108260bd6a34ebabab0465d758ca98cba522932532e45  gawk-3.0.4_0.tar.bz2
@@ -107,7 +107,7 @@ e4a6dd6ff78b4f46e17e2b867e1562e1fa3a6c75db890c136818382d31619b78  python-3.4.10_
 6081832f1fc258df7dd927986821991b49fa78a71b76f4b37b5c34a8ebc9bc86  sed-4.0.9_0.tar.bz2
 e58d8ec46c5b31175de9598bf0da214b88ccbd4cca7a787f3d048c44edaf3ceb  sed-4.8_0.tar.bz2
 912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647  tar-1.34_0.tar.bz2
-a07edeebe88d27afe01ae4b9c2fec7d26f54d87928976927f73d9dba5f50782b  tcc-0.9.27_0.tar.bz2
+a297b20252833d5c7b95ca343c85e84f9e5262e71beab9176ccf542833b75b4e  tcc-0.9.27_0.tar.bz2
 41a4b0fbf461dd26ecd31d77b300c979a4decae185c9e2d50c0470bc49d0b893  tcc-0.9.27_1.tar.bz2
 cbfc578c709f677ec3e9792a8620e4e2a88d13d93969fd54aac93e4a29c2604d  tcc-0.9.27_2.tar.bz2
 2b503cd31d3326ac1ed0eb9f506ac93c93770da51164e152a812cd248961069c  tcc-0.9.27_3.tar.bz2
diff --git a/sysa/bash-2.05b/bash-2.05b.checksums b/sysa/bash-2.05b/bash-2.05b.checksums
index 6d40bce..6667d0e 100644
--- a/sysa/bash-2.05b/bash-2.05b.checksums
+++ b/sysa/bash-2.05b/bash-2.05b.checksums
@@ -1 +1 @@
-a11ab8528cd79c67a0514ce2581ee81f50398cea1b4c616a22c488c0cc2d619e  /usr/bin/bash
+79d7f5e9f4f735575a6a163023150017587a97c5f911d81fc91380cea8bb4362  /usr/bin/bash
diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums b/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums
index f1aa008..024fc04 100644
--- a/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums
+++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums
@@ -1 +1 @@
-532b2455e0b0c6fd3ef067776a61ebd0620437d1f55145ce56ce1ddad23844c5  /usr/bin/bzip2
+ce63f5ac31e9a0b9740df12d8c1ce1dd635aac270687e5ede2e32990f301ebe2  /usr/bin/bzip2
diff --git a/sysa/coreutils-5.0/coreutils-5.0.checksums b/sysa/coreutils-5.0/coreutils-5.0.checksums
index bdf8ab6..c71eca1 100644
--- a/sysa/coreutils-5.0/coreutils-5.0.checksums
+++ b/sysa/coreutils-5.0/coreutils-5.0.checksums
@@ -1,61 +1,61 @@
-dafe043ca795c8bea27a6bc5cbdfbc4f59671809f6f9774b9e94831ea6405a80  /usr/bin/install
-78cf8e0ee96e7428496d0fdccc60e8465f7aaf3728a463123fefb8f46bc5d073  /usr/bin/basename
-70146b4ce3092cd7ccaf933d2eb6e93c1b12358240838f66a1a7743a8100e870  /usr/bin/cat
-c0b5b1eb102784c8202ec82990fffc4c57ba0da5724ac44544994a1d5a50615f  /usr/bin/chmod
-113910e58f8bb9506f5fd3c5394e7792b47bf9c7e7479941882c1368481b2e40  /usr/bin/cksum
-2f666cac19e38d7653975e68485ade9f6a4bb9414fa9364716414b294f3720d1  /usr/bin/cp
-27f6fe3aa713d62cd9367ccafb2c52029f1f87e2d07cbadf7b71023240149fda  /usr/bin/csplit
-11068650333e2c0af8e9c8abb79c3d5c8fbe261b5a72b454ca632ad3ec5b965b  /usr/bin/cut
-7f5afda1460b2148f8b362bc37e252caf6bf02df10aab02a21f5581295921b97  /usr/bin/dirname
-ecbbb0202e9b8274c93e41d831eddc809f7714c6e8004136e2fc7f1a0a30e799  /usr/bin/echo
-a2962caac7a407f50a94c1d6496de9ca65c8ff66a3aa3e814a69f6aa3253dea2  /usr/bin/expand
-61ffbe47da01a828ce0a0e2b871deb065bcaf874b831c019131d62bb5156e194  /usr/bin/expr
-28c8920fb8ce6e5ed74f8be8a854688b8aa5155baf70812259c471fd84d2d716  /usr/bin/factor
-1a851ce640196e1562d392f2a71cf294937513a43fd9b52e146c803722bd6c9e  /usr/bin/false
-fda23f5d23a65799794b49b3befa8d515e1e0f221c4b67e9dead07ca4b492c4c  /usr/bin/fmt
-2241e52196cc6f204528c32d844361cb917031cdfe5efda90ee6f2f3b2fb6a1a  /usr/bin/fold
-813bc16b973c2d13b96980d22d8ad49974aac356226781868af68973ba8229a2  /usr/bin/head
-7948309bd45223be43e385367a56cf5fcd30ac7c94685423e651fab2d1c0a80d  /usr/bin/hostname
-fd55b2ed55a27de3c57dccf64c1457613a109c231dc0f8a40b650fb2f6114ab2  /usr/bin/id
-9cb2877544e4dfc2521d54c3b18811dad170a6b31aeaa7556b73edcf57cb6668  /usr/bin/join
-a532dfb88e4226ba1600ab8eb3c7a2801b6b7bc2d50200ba70470723322babfe  /usr/bin/kill
-495a20a8342ab6d61806342ef61d8ad135a7c8f2bfa8a2edbd6cb5e839d577a7  /usr/bin/link
-38b90400c1be7792872bbb0781627b2dba35a70abf41899e9ee19d59ef351fe9  /usr/bin/ln
-323097645c46aab33711f562ff7ed1fda4609970d7e55e6ab2fd31dd1ed0bfb0  /usr/bin/logname
-354547f7467df48dd0bbaf9c7f36c8168dc8a38ccfe97409847dbb50c05cba90  /usr/bin/mkfifo
-2326009b57ace4bc7da598d322fcf7c2cdcd702723c6cdb81a50a1ceb0631933  /usr/bin/mkdir
-f964752c462185f7ea54246b4e53bca7ee84cfc4b590bef04baa8700312e2224  /usr/bin/mknod
-a9311865c1e95766e3be810617fce3892d5ea693fd3cdb26d680f75c579670f2  /usr/bin/nl
-c68b80b2dff6423f5c92ec1cf02f30c61c9560f2a3499acf617aeee7c407d7b5  /usr/bin/od
-775ec8b0a5c37a7360535c1c040b5c98e6177e69f978f520ee928efab39ed519  /usr/bin/paste
-b45c0d13af7f9b1cad618fdcd48ec7db80d9e59acf37ced076c4a65412b3a5a7  /usr/bin/pathchk
-267b1a8a23bf764f833cef10da9f0c77583234baed24bd67362a008015231ee3  /usr/bin/pr
-6375dd4cb3d1326c895844fa7128d3d7c88df9da7b85830e23bc61d99e0bc186  /usr/bin/printf
-9665a522e43fb6d2a7d66c217873cc9eb02936a51ff97b426214316b76a92792  /usr/bin/ptx
-7af4c3a707f382730836223ce8651850e78e9aac4079cf2e0e7996cac8449011  /usr/bin/pwd
-6c2fc79aef8bcb5ce79961481b6d30fb5bf3648d71e60ab1df9a75621f0471d0  /usr/bin/readlink
-3249f3b8a09e6862ce1a0c09b4e805fa03f6cfef70ee81c70704f0b481b20f45  /usr/bin/rmdir
-014f6c56864a02903fcddc8f681459ab455524f12ace562fb4ff50b67cd07dab  /usr/bin/seq
-de46fe9655bad40463d8af57ec6fe0dd4d56fb4056a7fcef9e57eebf9c497959  /usr/bin/sleep
-a6bbb377c517f2c00652b16f8eb14e8ba54fa318faf6c90fa82ebcc84fb14986  /usr/bin/sort
-7d62c06a21c4eb9989f01bacf406bffe1b7e9d69596eac4fa6373e9ce7f7cb3b  /usr/bin/split
-00a0f9b9dc137193e6ddb0b7dba679ee98865dfc69589bcb619de0044fdb5550  /usr/bin/sum
-38b82cf9f2a4818061cabc32e78df8cc552c1384cecf669b8a221f44fb1cf06b  /usr/bin/tail
-e2683f200a8c14eef6d92d6ee3b4fdbc48b4f1cf5ea58ccab57259f6b8a315d5  /usr/bin/tee
-ff9492d8e088acf1a689e907c9550ba78029a778bd2818674d4989cddbc28853  /usr/bin/tr
-159651d7a72db3e4752ee184288c55a1fee0484443aa67e4f3a9984ad7320e78  /usr/bin/tsort
-9f6f55239fa384564f78347b70c1287310283121446d63071045f6fd3eac90b1  /usr/bin/unexpand
-58b692ef7cc3f644eca0b21cd792ac6037202788e9bcee1204ba155a750e27ca  /usr/bin/uniq
-1c6c0306829c5c0695d9e5336682aac3494eb78b86b0806fb8b94b4edbe9e670  /usr/bin/unlink
-c601ba79b716d782bd8f01e2e3804bd2a66fdc6519c7c27dc709def51558ed53  /usr/bin/wc
-762c3ac63eeafd49de5f324b16b1895167110e2ddee553c6f5198c7d71880caf  /usr/bin/whoami
-e0a3acd8a5ea91c112bc63281f54a1e56d11991f0ec3b72d5a5becaf11bf6c9a  /usr/bin/tac
-a728386f022a00b79a683ab39f9f85a2561e110ff6e6786d304320d8ed9e4e97  /usr/bin/test
-3948a25742e25552b30b018269038723d7f6eb80a4c18c2f85bb84fe13729930  /usr/bin/touch
-f4f039c380c8f979bd40b02fc458840db3f1086d7e7f9a209e860340a548a42b  /usr/bin/true
-43e5a7794084a505fdfd367d6d66e5f0b8ba3c3d843cdc6036416d49c68b79b5  /usr/bin/yes
-3e187de38d3c75ef52d74c4bba8dae228dad81e81e9209e3994a6bffe8ee09c9  /usr/bin/ls
-4917fb8bb8a4fb9e24b6cc27de9dd1944acef84b8f5f9b150c0aa9f87b37f6ca  /usr/bin/md5sum
-8c8ed60125c5b34b4d3d156baf2b4c682dee313bc795bb1b4b15427827d62ca8  /usr/bin/mv
-48c1f9f1847bff208be5bf04ea5897a0c1454f5b8e748a451e755631519c85f1  /usr/bin/rm
-5d717b9176ebb05216c869e7ee9711e0fdc6ac2f8dec15d9e94a2ed35832c9c9  /usr/bin/sha1sum
+292fcbf47ee383832767bb2bb8b378f96a14dd68725270ae0db5539a94d031f3  /usr/bin/install
+a57f7328c2a81bd50fe5c83015406634baa8747211f912c9090e162e70735110  /usr/bin/basename
+f2e6cf099ee87d2f4a3b1e62db57075fab98ee3d2d5839ff9e81eb0ac0e37137  /usr/bin/cat
+9c77061b24adf9ba42951f8008dc457bcefff17b87d867f09a61f0c96817f083  /usr/bin/chmod
+669211c275348cff62c580d96119af225735746c0168edb63492116bf9647bd1  /usr/bin/cksum
+5be51d83898d33ffced444433fb977bd576e7bd3c37330f311458502f990083a  /usr/bin/cp
+e72996b66d573cfb1f27120ade2fd29bc9582e79057d8d43b6081aea510562d4  /usr/bin/csplit
+a22cc2f79c70fac946e79fd93551578505c69a76beba68cbebb8d32e323a3e49  /usr/bin/cut
+9e2b178412eaa6b8442940b632452d931af50dc8be1c770d47e752248d9fd4ea  /usr/bin/dirname
+42d8967cdfdd14e9f6f4ad6feb3e899f491ce2dcb6cb62f5160b6bd217bc4a04  /usr/bin/echo
+dda7112d7c33fe77486f4336d5d57cc3228ce9a18082332250af2c0be57391b0  /usr/bin/expand
+6f32c1383580aa37c9877eaed65090839dd3d12d8868ded3147c1adbdeb9a909  /usr/bin/expr
+d8eaa5d9d8e601fdbbe4715e5632a55efa986e691027590ac5905c150d8e4f94  /usr/bin/factor
+9f1f38e219d15070ece6229c3f75e40f11e5a3aaf426ee17745b95bb5205c94d  /usr/bin/false
+98915280c8bad059cfb1bf99636dc69bf33532f7a982bd086d2114e0daa39a76  /usr/bin/fmt
+a8f6d99bc641f486ebdbc1bc5adb1b9fa424aceb4d9e0cc62ce08ceb43541c88  /usr/bin/fold
+4d215db24218e8b6dfeeea05268477fac56b11651d789a5972945a15ab7b2917  /usr/bin/head
+52718fa65c99150a773da13f4b155f8843391219f89d4aa0d5fe1d3cc9cf36b0  /usr/bin/hostname
+fc845714f8d461698daaadcd7bb507d4228c09504b886a679c129226727186d0  /usr/bin/id
+2fbe6af8f5c01521edacff2d145b8ee392489684e1624157e1e1841aade290a2  /usr/bin/join
+ea4e13ec9e2f622600d961be4f41de96251e429e7ed8a881be8fb70c379b80de  /usr/bin/kill
+5c606a0febaeca39455847b11ea2ad1445cd4bfd40e187e4e3499c23e0dc2d43  /usr/bin/link
+52c561306a91197034106b20678da1b06e77228ab77a3ce40639fa1c132d44bc  /usr/bin/ln
+2d7450a962ffdb434d2061aa36e74aa18e1e3e5d237eb39ccd3851a34a819694  /usr/bin/logname
+bb651823aa51315576d30c79c84248577bce2daab9be4cbcaedabdf2aef882a5  /usr/bin/mkfifo
+051a8465ba5e34d0f8c84f34f618b2ff059e566bf52d36c572d164762eca3618  /usr/bin/mkdir
+50be768057f0284b4b9cc034b990cc739228b96449c1c2062d9d98c778b1d4b5  /usr/bin/mknod
+e7c50e668907ce88388f127b2f07aed6dc10ddb6a8c9313f4269ed5b7e923c92  /usr/bin/nl
+ae1033bcc79daca95df1feefa3b4d64c0313cc2bf021efcf14760cccc5b42215  /usr/bin/od
+79aa11388de19028de66b06ce6e0983ba0d558b146aed51ce293d599fcaec627  /usr/bin/paste
+70eb12b8db8550d5b642df34d28f19e76a768a425efccaa8dfaee18c41db1228  /usr/bin/pathchk
+1fa81f879efc48472ab093eb82edc429736a10078aecab04d2b2cfb9634b47ef  /usr/bin/pr
+8913fd449afc122c42b99b89b04428a22e7f07e032eaa530cbd076e611849a23  /usr/bin/printf
+b87663d81cc361221e643ca9f064995c7333f7c650f918393c9bb4482d8667e3  /usr/bin/ptx
+d31910a5308cfe80f2136677234d515728a06c84f60441f131d2b8dd878ce3aa  /usr/bin/pwd
+84290d1d0a662ffc8d0ec314bbffa53aaacdae4104d8ba8f9a56d8896e97923b  /usr/bin/readlink
+55dfb9a4c9c1f4efe74aaceaad37baff1e9f24acea83ac92a7008b703394edd4  /usr/bin/rmdir
+fec6d4f310ee0ad79fc76a23ed440b916502bc30af41c4a5e1ed578d2dca91f3  /usr/bin/seq
+1d0c39f163aa5029d867a091e5d1963b8e55aec09c33cd99da237df7e5b31e60  /usr/bin/sleep
+355ba0b4e1e655cfde75c493d907a68dbe2acf12adec88eaad019f231de1e75b  /usr/bin/sort
+96ab28039a859a5b78f142aabe75f55b560e340e350751ce3696d02903dfb31f  /usr/bin/split
+8852646f277cfbb01eff42c903f03248a7e3e9833cf3655c78a34f02687872ee  /usr/bin/sum
+79b02fef988b77c1e3adee565aa474aec05e522ef4a5fd4635ca9bb6b1e65b6c  /usr/bin/tail
+91038661556a3c6e91d4f45b41e44388bf62aea5a37abeca3395740344e03890  /usr/bin/tee
+0c4517c49db58cd700f588281557514894e5c924bfad5df129a70ff46d4a8dae  /usr/bin/tr
+2d897818467998063800a4e92c50fa855b090202da11831f87be17665fd44a29  /usr/bin/tsort
+f8ca50f4d91ef6233049e2bd68cf6aa05a300a16d9fba2dce2e90e085ab8f401  /usr/bin/unexpand
+c8066c50b1a6f654a4cd1adc69e3a7fd58c6fa6ce987617c54b0d2668cb39daf  /usr/bin/uniq
+93feee6a854be3a733f9e7a4e421e274f0781d235c02421b837fee3134c47897  /usr/bin/unlink
+a31f4b48b7517a348b44621e8d572eda835ffcdb7a97f64b1d7e78d67a38c84f  /usr/bin/wc
+fae709b45aca8b7e4630aa853681b6f1d053135b4a5c8f72477a1e311f1e4616  /usr/bin/whoami
+11a17c10d03e56012685851f96145fe8a4701fd4ecbf05bad1c19b92fe97f347  /usr/bin/tac
+ceac9200b63c7b8b3cda19ca4e90b7d619c3bbd412834a7cb14ae022e5f05fa2  /usr/bin/test
+958a28e582bb69c684f666e2b47b98ff27d3b9a6177549444b85c03aad746c3d  /usr/bin/touch
+05dc8f5f6d78716f649eb7ad5d355a67b6e133e241efcd0b99d5bd1b3c01b3b1  /usr/bin/true
+2203da05ecbf1d8be50e4c9669d78f8c45aa09055e55486322e18f9874cb3b4e  /usr/bin/yes
+7ec9570369e239d3f295490250fc0d79c32fd6cf2d7d4eb02042c56c67d8bc86  /usr/bin/ls
+8323119905c2d42d9aefafb214ae314b7b9103247263328472d909fd794ffe8a  /usr/bin/md5sum
+e2ed596c2adba6cab2853cea203f66bf5aeee85d3424685acffc567dc417459a  /usr/bin/mv
+cb67b297e4e4f124f6c0a2a392fb8934ea8c07af4155bd7d49f367b9c77f4719  /usr/bin/rm
+b51e023e8e70a8cc6dadaba1a789c5c8c96dc526f224a1e8de44e57aad31ca7a  /usr/bin/sha1sum
diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.checksums b/sysa/gzip-1.2.4/gzip-1.2.4.checksums
index f54b224..c7aa5a0 100644
--- a/sysa/gzip-1.2.4/gzip-1.2.4.checksums
+++ b/sysa/gzip-1.2.4/gzip-1.2.4.checksums
@@ -1 +1 @@
-6608aee8c4a8fdb0945e8b7b0a6f9fe3ca5336394bbcbc564879971e0129a6f1  /usr/bin/gzip
+2eea6424aebf9d68e674c48c729e2eff72cfe330f5d4a5cc3918b7275c36e679  /usr/bin/gzip
diff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums
index d1ab8be..88d6ccb 100644
--- a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums
+++ b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums
@@ -1,5 +1,5 @@
-9f5186c86f8a2c7a0eb39d11f7017fc70d5a3940d56c648f93f6a3189ac1d67f  /usr/bin/yacc
-0fa43f12e3e32987211a433a9692f939b2c5d0dc32cd5523f9ad50bb441ac580  /usr/bin/lex
+671a1b5f07f5c5facc7cf502d5471ceabd82927180b127fe61f9ada04dfb4de0  /usr/bin/yacc
+c8c51b6f773d5d14deb73216181a2c3975376082d411cd044d7033b3b5553202  /usr/bin/lex
 ffe696afc1bda32a5f4035e29b3275cab73a27df7635ccbe02ed49a30374ccdd  /usr/lib/mes/libl.a
 bf3fb293f1ff89ee3dbcb08166c64b7a6793b49a12673d7633e3353ebea80d4d  /yaccpar
 ee0f187b844f50d64c912bfcb5d73706662846d6d8a90b8b1fb20dda60464734  /lex/ncform
diff --git a/sysa/kexec-fiwix/kexec-fiwix.checksums b/sysa/kexec-fiwix/kexec-fiwix.checksums
index 8b84157..26bbd43 100644
--- a/sysa/kexec-fiwix/kexec-fiwix.checksums
+++ b/sysa/kexec-fiwix/kexec-fiwix.checksums
@@ -1 +1 @@
-7c0d280b732b8dfe767cacefc0245698796d953083ab4bcccfcb77f6d4fc4828  /usr/bin/kexec-fiwix
+6301eb2b25e777b464b5de79a1c6c453708a5f15de7a396e638eb51141a16440  /usr/bin/kexec-fiwix
diff --git a/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt b/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt
index a73755e..60f882d 100644
--- a/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt
+++ b/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt
@@ -73,6 +73,7 @@
 /usr/include/mes/config.h
 /usr/include/mes/constants.h
 /usr/include/mes/lib.h
+/usr/include/mes/lib-cc.h
 /usr/include/mes/lib-mini.h
 /usr/include/mes/mes.h
 /usr/include/mes/symbols.h
diff --git a/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums b/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums
index 735c420..903cfb7 100644
--- a/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums
+++ b/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums
@@ -1 +1 @@
-7b65748dd946f1a5266b2e6d0c9cf7143b4722dae0dd4a02b89d6fba9909e2bd  /usr/bin/make_fiwix_initrd
+a1c3fc496659b55e3600c06c76c374b76da5f19d153f44dbf5796fe7a0d8283d  /usr/bin/make_fiwix_initrd
diff --git a/sysa/make-3.82/make-3.82.checksums b/sysa/make-3.82/make-3.82.checksums
index 6329430..2cb8e16 100644
--- a/sysa/make-3.82/make-3.82.checksums
+++ b/sysa/make-3.82/make-3.82.checksums
@@ -1 +1 @@
-aa57178c15d44020d30cc893a5cf75278a38a801361f0373cf17600cf534c73c  /usr/bin/make
+7dac94ec2651bb6ca9666c2234171ebe51278cbb7ff533ee84ab0fb1b3dd432e  /usr/bin/make
diff --git a/sysa/mes-0.24.2/mes-0.24.2.checksums b/sysa/mes-0.24.2/mes-0.24.2.checksums
deleted file mode 100644
index fcd3f2e..0000000
--- a/sysa/mes-0.24.2/mes-0.24.2.checksums
+++ /dev/null
@@ -1,14 +0,0 @@
-b2a48b2724a7b791df66efc2384a405a91d26579459a6797514dec89c2e76658  /usr/bin/mes
-148ce096422535832802494f1128c26b6580cf3b66635e56abb33f7b3fc26043  /usr/bin/mes-m2
-17c86665c2f925d88e3c1f827f312bbc7575b9e6006ef57833e895b6e73b8087  /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
-7ec49fbcbc70b49648150b021a2ff9ab2b27e89eb8815919a7ffabe375ab1edc  /usr/lib/x86-mes/libc+tcc.s
-b935d4c30213b49d899ab8bccce33117057ea0f3a1a8d3afc5e07fb8ce4590db  /usr/lib/x86-mes/libc.s
-52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /usr/lib/x86-mes/libmescc.a
-840ee884db456e1982f40bce82209515a8e0b09bc404c4bc2a26d237bfa4d9ca  /usr/lib/x86-mes/libc+tcc.a
-32be26479096c52dbffe9c8bf14765f753d6882c3ae43760eda03406c0cf2539  /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-0.24.2/files/config.h b/sysa/mes-0.25/files/config.h
similarity index 100%
rename from sysa/mes-0.24.2/files/config.h
rename to sysa/mes-0.25/files/config.h
diff --git a/sysa/mes-0.24.2/mes-0.24.2.kaem b/sysa/mes-0.25/mes-0.25.kaem
similarity index 84%
rename from sysa/mes-0.24.2/mes-0.24.2.kaem
rename to sysa/mes-0.25/mes-0.25.kaem
index 82f3f6f..4a1ba06 100755
--- a/sysa/mes-0.24.2/mes-0.24.2.kaem
+++ b/sysa/mes-0.25/mes-0.25.kaem
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: 2020-2022 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2020-2023 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -22,6 +22,10 @@ if match ${ARCH} amd64; then
     MES_ARCH=x86_64
     ARCH_BITS=64
 fi
+if match ${ARCH} riscv64; then
+    MES_ARCH=riscv64
+    ARCH_BITS=64
+fi
 
 # Check tarball checksums
 checksum-transcriber sources
@@ -37,7 +41,7 @@ cd ..
 cd build
 untar --file ../src/${NYACC_PKG}.tar
 untar --non-strict --file ../src/${MES_PKG}.tar # ignore symlinks
-mes_run=/sysa/${MES_PKG}/build/${MES_PKG}/kaem.run
+mes_run=${MES_PREFIX}/kaem.run
 replace --file ${mes_run} --output ${mes_run} --match-on 0x1000000 --replace-with 0x8048000
 
 rm ../src/${NYACC_PKG}.tar ../src/${MES_PKG}.tar
@@ -56,13 +60,8 @@ rm mes/module/mes/psyntax.pp mes/module/mes/psyntax.pp.header
 cp mes/module/srfi/srfi-9-struct.mes mes/module/srfi/srfi-9.mes
 cp mes/module/srfi/srfi-9/gnu-struct.mes mes/module/srfi/srfi-9/gnu.mes
 
-# Fixes to support newer M2-Planet
-catm ${MES_ARCH}_defs.M1 /M2libc/${ARCH}/${ARCH}_defs.M1 lib/m2/${MES_ARCH}/${MES_ARCH}_defs.M1
-cp ${MES_ARCH}_defs.M1 lib/m2/${MES_ARCH}/${MES_ARCH}_defs.M1
-rm ${MES_ARCH}_defs.M1
-
 # Build mes-m2
-kaem --verbose --strict --file kaem.run
+kaem --verbose --strict --file kaem.${MES_ARCH}
 cp bin/mes-m2 ${bindir}/mes-m2
 chmod 755 ${bindir}/mes-m2
 
@@ -86,6 +85,7 @@ alias mescc="${MES} -e main ${bindir}/mescc.scm -D HAVE_CONFIG_H=1 -I include -I
 mescc lib/linux/${MES_ARCH}-mes-mescc/crt1.c -o lib/${MES_ARCH}-mes/crt1.o
 
 # Now for libc-mini.a
+mescc lib/mes/__init_io.c
 mescc lib/mes/eputs.c
 mescc lib/mes/oputs.c
 mescc lib/mes/globals.c
@@ -94,9 +94,8 @@ mescc lib/linux/${MES_ARCH}-mes-mescc/_exit.c
 mescc lib/linux/${MES_ARCH}-mes-mescc/_write.c
 mescc lib/stdlib/puts.c
 mescc lib/string/strlen.c
-mescc lib/mes/mini-write.c
-catm ${libdir}/${MES_ARCH}-mes/libc-mini.a eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o mini-write.o
-catm ${libdir}/${MES_ARCH}-mes/libc-mini.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s mini-write.s
+catm ${libdir}/${MES_ARCH}-mes/libc-mini.a __init_io.o eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o
+catm ${libdir}/${MES_ARCH}-mes/libc-mini.s __init_io.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s
 
 # libmescc.a
 mescc lib/linux/${MES_ARCH}-mes-mescc/syscall-internal.c
@@ -174,12 +173,13 @@ mescc lib/linux/_open3.c
 mescc lib/linux/_read.c
 mescc lib/linux/time.c
 mescc lib/linux/unlink.c
+mescc lib/linux/wait4.c
 mescc lib/linux/waitpid.c
 mescc lib/linux/${MES_ARCH}-mes-mescc/syscall.c
 mescc lib/linux/getpid.c
 mescc lib/linux/kill.c
-catm ${libdir}/${MES_ARCH}-mes/libc.a eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o isnumber.o abtol.o cast.o eputc.o fdgetc.o fdputc.o fdputs.o fdungetc.o itoa.o ltoa.o ltoab.o mes_open.o ntoab.o oputc.o ultoa.o utoa.o isdigit.o isspace.o isxdigit.o assert_msg.o write.o atoi.o lseek.o __assert_fail.o __buffered_read.o __mes_debug.o execv.o getcwd.o getenv.o isatty.o open.o buffered-read.o setenv.o wait.o fgetc.o fputc.o fputs.o getc.o getchar.o putc.o putchar.o ungetc.o free.o malloc.o realloc.o memchr.o memcmp.o memcpy.o memmove.o memset.o strcmp.o strcpy.o strncmp.o raise.o access.o brk.o chmod.o clock_gettime.o dup.o dup2.o execve.o fork.o fsync.o _getcwd.o gettimeofday.o ioctl3.o _open3.o _read.o time.o unlink.o waitpid.o syscall.o getpid.o kill.o
-catm ${libdir}/${MES_ARCH}-mes/libc.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s isnumber.s abtol.s cast.s eputc.s fdgetc.s fdputc.s fdputs.s fdungetc.s itoa.s ltoa.s ltoab.s mes_open.s ntoab.s oputc.s ultoa.s utoa.s isdigit.s isspace.s isxdigit.s assert_msg.s write.s atoi.s lseek.s __assert_fail.s __buffered_read.s __mes_debug.s execv.s getcwd.s getenv.s isatty.s open.s buffered-read.s setenv.s wait.s fgetc.s fputc.s fputs.s getc.s getchar.s putc.s putchar.s ungetc.s free.s malloc.s realloc.s memchr.s memcmp.s memcpy.s memmove.s memset.s strcmp.s strcpy.s strncmp.s raise.s access.s brk.s chmod.s clock_gettime.s dup.s dup2.s execve.s fork.s fsync.s _getcwd.s gettimeofday.s ioctl3.s _open3.s _read.s time.s unlink.s waitpid.s syscall.s getpid.s kill.s
+catm ${libdir}/${MES_ARCH}-mes/libc.a __init_io.o eputs.o oputs.o globals.o exit.o _exit.o _write.o puts.o strlen.o isnumber.o abtol.o cast.o eputc.o fdgetc.o fdputc.o fdputs.o fdungetc.o itoa.o ltoa.o ltoab.o mes_open.o ntoab.o oputc.o ultoa.o utoa.o isdigit.o isspace.o isxdigit.o assert_msg.o write.o atoi.o lseek.o __assert_fail.o __buffered_read.o __mes_debug.o execv.o getcwd.o getenv.o isatty.o open.o buffered-read.o setenv.o wait.o fgetc.o fputc.o fputs.o getc.o getchar.o putc.o putchar.o ungetc.o free.o malloc.o realloc.o memchr.o memcmp.o memcpy.o memmove.o memset.o strcmp.o strcpy.o strncmp.o raise.o access.o brk.o chmod.o clock_gettime.o dup.o dup2.o execve.o fork.o fsync.o _getcwd.o gettimeofday.o ioctl3.o _open3.o _read.o time.o unlink.o wait4.o waitpid.o syscall.o getpid.o kill.o
+catm ${libdir}/${MES_ARCH}-mes/libc.s __init_io.s eputs.s oputs.s globals.s exit.s _exit.s _write.s puts.s strlen.s isnumber.s abtol.s cast.s eputc.s fdgetc.s fdputc.s fdputs.s fdungetc.s itoa.s ltoa.s ltoab.s mes_open.s ntoab.s oputc.s ultoa.s utoa.s isdigit.s isspace.s isxdigit.s assert_msg.s write.s atoi.s lseek.s __assert_fail.s __buffered_read.s __mes_debug.s execv.s getcwd.s getenv.s isatty.s open.s buffered-read.s setenv.s wait.s fgetc.s fputc.s fputs.s getc.s getchar.s putc.s putchar.s ungetc.s free.s malloc.s realloc.s memchr.s memcmp.s memcpy.s memmove.s memset.s strcmp.s strcpy.s strncmp.s raise.s access.s brk.s chmod.s clock_gettime.s dup.s dup2.s execve.s fork.s fsync.s _getcwd.s gettimeofday.s ioctl3.s _open3.s _read.s time.s unlink.s wait4.s waitpid.s syscall.s getpid.s kill.s
 
 # Build mes itself
 mescc src/builtins.c
@@ -235,6 +235,7 @@ mescc lib/stdio/vprintf.c
 mescc lib/stdio/vsnprintf.c
 mescc lib/stdio/vsprintf.c
 mescc lib/stdio/vsscanf.c
+mescc lib/stdlib/abort.c
 mescc lib/stdlib/calloc.c
 mescc lib/stdlib/qsort.c
 mescc lib/stdlib/strtod.c
@@ -330,6 +331,7 @@ cp include/mes/cc.h ${incdir}/mes/cc.h
 catm ${incdir}/mes/config.h
 cp include/mes/constants.h ${incdir}/mes/constants.h
 cp include/mes/lib.h ${incdir}/mes/lib.h
+cp include/mes/lib-cc.h ${incdir}/mes/lib-cc.h
 cp include/mes/lib-mini.h ${incdir}/mes/lib-mini.h
 cp include/mes/mes.h ${incdir}/mes/mes.h
 cp include/mes/symbols.h ${incdir}/mes/symbols.h
@@ -355,7 +357,7 @@ cd ../..
 
 # Checksums
 if match x${UPDATE_CHECKSUMS} xTrue; then
-    sha256sum -o ${pkg}.checksums \
+    sha256sum -o ${pkg}.${ARCH}.checksums \
         /usr/bin/mes \
         /usr/bin/mes-m2 \
         /usr/bin/mescc.scm \
@@ -371,7 +373,7 @@ if match x${UPDATE_CHECKSUMS} xTrue; then
         /usr/lib/linux/${MES_ARCH}-mes/elf${ARCH_BITS}-header.hex2 \
         /usr/lib/linux/${MES_ARCH}-mes/elf${ARCH_BITS}-footer-single-main.hex2
 
-    cp ${pkg}.checksums ${srcdir}
+    cp ${pkg}.${ARCH}.checksums ${srcdir}
 else
-    sha256sum -c ${pkg}.checksums
+    sha256sum -c ${pkg}.${ARCH}.checksums
 fi
diff --git a/sysa/mes-0.25/mes-0.25.x86.checksums b/sysa/mes-0.25/mes-0.25.x86.checksums
new file mode 100644
index 0000000..71c42cb
--- /dev/null
+++ b/sysa/mes-0.25/mes-0.25.x86.checksums
@@ -0,0 +1,14 @@
+bd873a7b98939a9430c278755db485daaaa92f8fc8990b5dcad6895d0f714db1  /usr/bin/mes
+6572d1298f3a25da5a3543b783ec8cb5798ccfe4b11dcaebffa633f47c246f84  /usr/bin/mes-m2
+5b158971c9bb6eceba00d438dc605fe186b46058b89e7118aca4037f5678834c  /usr/bin/mescc.scm
+234c264965116a24583dd569050adc766d7cc2da83b1db38085210f26031b70c  /usr/lib/x86-mes/crt1.s
+494f184a87175abc485a898c250c3831b2b5dcf5aead46591e00b39d1c5529fc  /usr/lib/x86-mes/crt1.o
+8afe05c3e1e8848b6f3e8de751524de5f69818eb8524659827918e3fddde3e1e  /usr/lib/x86-mes/x86.M1
+771988b1df0dfa04bf5f1ab72af18c32b1a8205a07f10e5235d79dac0a072b00  /usr/lib/x86-mes/libmescc.s
+89024362827679beffb4a70287d66609d07a3cf4a1972c1c40797bfa0324a49e  /usr/lib/x86-mes/libc+tcc.s
+5ea659501bda293f9297b599b1385ed4d54bab0e6daf3207fc61429adc9abc78  /usr/lib/x86-mes/libc.s
+52f697278ccdff5e457f27e10f465a91ab9858f0c6cee0683831cadb3109bbb7  /usr/lib/x86-mes/libmescc.a
+7c737307c870d74a309cec58f6b67fa4961d582614f3ed0f39b5794e3705794a  /usr/lib/x86-mes/libc+tcc.a
+db62874a6cebeb0652945cb91cb91ade9783e631aaef5ec279e11aeca6adc421  /usr/lib/x86-mes/libc.a
+82cac4353375a52efecc6fda1f8b37373988fe41ed197b63d8e906321b105d77  /usr/lib/linux/x86-mes/elf32-header.hex2
+f9873d9aab12e70f24d97f8319e17a1e698ca60779ae9a6ab3ede648cd60fc61  /usr/lib/linux/x86-mes/elf32-footer-single-main.hex2
diff --git a/sysa/mes-0.24.2/sources b/sysa/mes-0.25/sources
similarity index 53%
rename from sysa/mes-0.24.2/sources
rename to sysa/mes-0.25/sources
index f68bbed..8a46966 100644
--- a/sysa/mes-0.24.2/sources
+++ b/sysa/mes-0.25/sources
@@ -1,2 +1,2 @@
-https://mirrors.kernel.org/gnu/mes/mes-0.24.2.tar.gz 7ddae0854e46ebfa18c13ab37e64839a7b86ea88aeed366a8d017efd11dae86e
+https://mirrors.kernel.org/gnu/mes/mes-0.25.tar.gz 325250b3567ed9203ba70161c835af01079e73ebed97b4b5bb77ca500b828940
 https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz f36e4fb7dd524dc3f4b354d3d5313f69e7ce5a6ae93711e8cf6d51eaa8d2b318
diff --git a/sysa/patch-2.5.9/patch-2.5.9.checksums b/sysa/patch-2.5.9/patch-2.5.9.checksums
index 08c3809..5a773f9 100644
--- a/sysa/patch-2.5.9/patch-2.5.9.checksums
+++ b/sysa/patch-2.5.9/patch-2.5.9.checksums
@@ -1 +1 @@
-0ad4338d5aaf61d126984508172e731da3162fea3d46b9fb34b2dc71beb96a1c  /usr/bin/patch
+cdb22238dfa7f659c3d7afae6e93f27b4c84a40e082b20bc78a8b19a0dc79536  /usr/bin/patch
diff --git a/sysa/run.kaem b/sysa/run.kaem
index a9cb35c..fddc36a 100755
--- a/sysa/run.kaem
+++ b/sysa/run.kaem
@@ -19,7 +19,7 @@ M2-Mesoplanet --architecture x86 -f simple-patch.c -o ${bindir}/simple-patch
 
 # Environmental variables needed for mes
 NYACC_PKG=nyacc-1.00.2
-MES_VERSION=0.24.2
+MES_VERSION=0.25
 MES_PKG=mes-${MES_VERSION}
 MES_PKG_DIR=${MES_PKG}
 MES_PREFIX=${sysa}/${MES_PKG}/build/${MES_PKG_DIR}
diff --git a/sysa/sed-4.0.9/sed-4.0.9.checksums b/sysa/sed-4.0.9/sed-4.0.9.checksums
index f7bb40c..98b8bb7 100644
--- a/sysa/sed-4.0.9/sed-4.0.9.checksums
+++ b/sysa/sed-4.0.9/sed-4.0.9.checksums
@@ -1 +1 @@
-bf0d4ef807c706a2b201c7d132c70314ad96aa24353d444bcaed4eca6c95a528  /usr/bin/sed
+27dbc29d04ad2a2905ab56c198660510010377062d716bc791a8d0e281fec4d4  /usr/bin/sed
diff --git a/sysa/tar-1.12/tar-1.12.checksums b/sysa/tar-1.12/tar-1.12.checksums
index 4677dee..35cbab8 100644
--- a/sysa/tar-1.12/tar-1.12.checksums
+++ b/sysa/tar-1.12/tar-1.12.checksums
@@ -1 +1 @@
-2186b01ab8d953222f15cab0d257f80215f4a17c53b30a5a7467b80e49c2cc34  /usr/bin/tar
+0b14f1849c2c8dab671399905753e0503f7ba60bfc807b0be13132da6c9814e9  /usr/bin/tar
diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.checksums b/sysa/tcc-0.9.26/tcc-0.9.26.checksums
index 51ef9a9..ca37046 100644
--- a/sysa/tcc-0.9.26/tcc-0.9.26.checksums
+++ b/sysa/tcc-0.9.26/tcc-0.9.26.checksums
@@ -1,13 +1,13 @@
-7897c2ba182e92765856a9e3ddd2bdfcd69988b3ddc45b3ef932dc3ec041041a  /usr/bin/mes-tcc
-64bdb36f0048744957454b6ad186d37db4a7fcc392f67bf052b9bc7ec033b963  /usr/bin/boot0-tcc
-18af79e0e3c4bfeaced2b0867561bc9fd370cbfcc78860de5a70926374ba7c53  /usr/bin/boot1-tcc
-d6fa0c2006f6c8fefb4f3750fade14aa884670637098857d06aef3c7a9bd02d8  /usr/bin/boot2-tcc
-93b2c1c567f5938435fbe6c0115276f6073bd46a0a92791b164ca2752180caf5  /usr/bin/boot3-tcc
-a40305e6d2acb3dc64dbc80f64952431f4728eeff03f6e7c91c737cbf6e1bdda  /usr/bin/boot4-tcc
-c56d99e284dfecae047e792b049c0cee022452f13262d6b3c869ec1c9935b276  /usr/bin/tcc
-96f93f2d281ee6996767b25fbff4441e8335e7eeaeab060c1d4b698366b277c9  /usr/lib/mes/libc.a
+b7e612fd5f6a15bcfaabe265ee05a34073d1ebd7af9d1728fbfa8a220bf94a0a  /usr/bin/mes-tcc
+b1cc0b2c465e3ab925b14ef170180e44420f41da3dd91de9339efd591746ba31  /usr/bin/boot0-tcc
+edf3572626066eb79325120787a51ab24a6add5d828c36f0131c61041edb5946  /usr/bin/boot1-tcc
+b6dd80a0e97d8711e3329874ed29a1d1228e23f1a82b2310df28244d2edbb3fd  /usr/bin/boot2-tcc
+16030de9c65641ee5869b452b2860e508ef1eb510ef56773c00e7d8ea2a5b702  /usr/bin/boot3-tcc
+cda5029eff7c73caae5aad64c756ba06c19efcdf858803060f7e35b5cfee1738  /usr/bin/boot4-tcc
+5b71b1c868c787d6c2ecf1223c2b87cb480b32c2ffab53f433f4d47d22b308f1  /usr/bin/tcc
+3bfd10dfe347c4fb40fbf5f2f705cd806c77e0f80cf4ad1ecfd4beddada2937c  /usr/lib/mes/libc.a
 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
-d1168ee9b528e39f0b40e8d51fb7fa3619c4a5ee928137f7faf6d0879b0916b0  /usr/lib/mes/crt1.o
+76d280e0733f2c84aad180968167d789a825ac56526bddba4f100d6d74851027  /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 cac1f17..df2cd25 100755
--- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem
+++ b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
@@ -42,6 +42,13 @@ untar --non-strict --file ../src/${MES_PKG}.tar
 cd ${TCC_PKG}
 catm config.h
 
+if match ${ARCH} x86; then
+    MES_ARCH=x86
+    TCC_TARGET_ARCH=I386
+    MES_LIBC_SUFFIX=gcc
+    HAVE_LONG_LONG=0
+fi
+
 ${MES} --no-auto-compile -e main ${bindir}/mescc.scm -- \
     -S \
     -o tcc.s \
@@ -85,7 +92,7 @@ cd ../${MES_PKG_DIR}
 
 # 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/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
+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/wait4.c linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/_exit.c linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/syscall.c linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/_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/__init_io.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 ${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/setjmp.c
 cd ..
 
 # crt1.o
diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.checksums b/sysa/tcc-0.9.27/tcc-0.9.27.checksums
index e9ed11d..70cf870 100644
--- a/sysa/tcc-0.9.27/tcc-0.9.27.checksums
+++ b/sysa/tcc-0.9.27/tcc-0.9.27.checksums
@@ -1 +1 @@
-e5f00ef66c5796f436089d3f6e67af001182e6fbb439d13bb65eef8cf82f5973  /usr/bin/tcc
+9e510b77307f4d9d97ad56ee58995217aaf0347d3c0f4b03f63da748f6c85d5f  /usr/bin/tcc
diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/sysa/tcc-0.9.27/tcc-0.9.27.kaem
index 080a796..0dd894f 100755
--- a/sysa/tcc-0.9.27/tcc-0.9.27.kaem
+++ b/sysa/tcc-0.9.27/tcc-0.9.27.kaem
@@ -58,7 +58,7 @@ cd ../${MES_PKG_DIR}
 
 # 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/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
+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/__init_io.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 ..
 
 # Recompile libc: crt{1,n,i}, libtcc.a, libc.a