Migrate knight-posix to M2libc

2021-01-22 00:35:43 -05:00 · 2021-01-22 00:35:43 -05:00 · f2094a9e5b
parent 3c6b23f734
commit f2094a9e5b
31 changed files with 320 additions and 334 deletions
--- a/test/test.answers
+++ b/test/test.answers
@ -8,132 +8,132 @@ a9f4f8e041eecc29536d0b877d134d30213d5775e235e8f3ac463f340842432e  test/results/t
 59eed61f835681183effabf49247892a99eded70711b31d5cd2829fff161e7bf  test/results/test0001-amd64-binary
 a1815ebef92f6e2006a442cadf76474c4bca4de6a772f1ff7ffb3f1a3a14259e  test/results/test0001-armv7l-binary
 bff3ae5a240cd319570ef0c81c499cea51c821bc1369456c23a4206e6072865e  test/results/test0001-knight-native-binary
-cbc443f9c13a93203b742386c6b2ac687cd152f218c54a5c865ca1984778fdec  test/results/test0001-knight-posix-binary
+06ed95778bb59b47ac40cd3be2b44f7057c28b4983c96c9f633ff3c84b7f1d7f  test/results/test0001-knight-posix-binary
 1965f1923ca0139a2921dc7d8e148a9418032e7d9b5c624763a12a791168bea3  test/results/test0001-x86-binary
 2cc32e960e701df78d34bcfe1dbe558d30d48881d4b499766032977369cae5f7  test/results/test0002-aarch64-binary
 6ae517b54db3803b2e3208c1bb1d77ead87102b328f7f6fd829bdcc667ffdede  test/results/test0002-amd64-binary
 8b52eee6d9ebc3a8ec2cf1190ab0a45f7ca8d552971b7c3815cc754d8f93893b  test/results/test0002-armv7l-binary
 b177407a336c5fe8ed31fc4c2f6e6f9160da8c3b166a1b6875dff5f3d9966e7c  test/results/test0002-knight-native-binary
-680036751e342224fd846968f34fed312d684652928f44bd1fcfcf8cb6c69565  test/results/test0002-knight-posix-binary
+2a74cd88a71560ffcd75bdcd1172e4d2c5c85fc4fb6a3f39a83cad549926c91c  test/results/test0002-knight-posix-binary
 c0b8d35d26a37094a49589b4bf8ff77d7ff7967b0aabd49e66ef90be5c4ef872  test/results/test0002-x86-binary
 71ce004e52c903b0e3c36a05c9b5db830add4c7267e383cce95f86fb46c8d642  test/results/test0003-aarch64-binary
 e4e20792ac1f164a50b918a45b481cc8d9bf0039453595dcf8c9059a40359809  test/results/test0003-amd64-binary
 93378a2dcea5bd4ed2bb5f51893dad6434a420df8c49853c6c5f03c56701b7c4  test/results/test0003-armv7l-binary
 5b64d3204ef384a664eb6d8ca665b48903f58b87409eec9571ff3d72384056eb  test/results/test0003-knight-native-binary
-3b42d5f1d02a2690ab800cf4b633db9b3c7eac57ad3f1e1c9072ffcb6ba2a7e3  test/results/test0003-knight-posix-binary
+8dba8cd939a647073e6e0651a743152cabdcfec8a900ca7fbbe70df33d2f81d5  test/results/test0003-knight-posix-binary
 7eed8f5086c0598b2966973b0e1dfe27adaf00394614a0fcaba66512c5fffc91  test/results/test0003-x86-binary
 f0888b779fb16e4b9b56ee2dbb8e51545adcdfd19852903001c06d48adc3df6e  test/results/test0004-aarch64-binary
 b9c2dd466a939a2c975ce39cc20f0e33b705eade57621181f0e31f12e89a4f9c  test/results/test0004-amd64-binary
 cff2e265d151bd2fa1713753543f78e2c9677470ffe220753660079a74025406  test/results/test0004-armv7l-binary
 17faf6968c97f4fb9ec53c5ab506def33501ba1aa6d3518b8d747b869663007c  test/results/test0004-knight-native-binary
-b21069bfb39e8e6f37ef2cfb0496506bc9596e83c73d8797714f602e626f1688  test/results/test0004-knight-posix-binary
+8d82721418ddd1ede82ff62cbcb2033188e19770a4ed32d3af6981605bee4ebc  test/results/test0004-knight-posix-binary
 0cc6f7b9d753a2734e789b35d8cba7e10f65f17fc126a2efef403a49bd1b739c  test/results/test0004-x86-binary
 4b40361fe6e936ffc2f8f0afe46ec5c0c66b4bb3b30f56c84e18036f8b063e5a  test/results/test0005-aarch64-binary
 ffc4a4da0880744053cba103abbde9fdd50bd5e298d0c8c51407d087b1b067dd  test/results/test0005-amd64-binary
 4d4d927953757473df56c7033996891acb5bae32510d92b5159e7aaf56c03d72  test/results/test0005-armv7l-binary
 66f964f025449632862eb190e668210a63535ae9d8c0dabde38c84f08f97b80b  test/results/test0005-knight-native-binary
-3e54a6270333eb17cba55ac6af43295cbf1a9f337d395f1d4126a11ea232e949  test/results/test0005-knight-posix-binary
+0278a97a86caf2c6a0b88214471d4f7f30c6b9b9361070e0b778211f4855e6bf  test/results/test0005-knight-posix-binary
 74f63fbaafd2cd097fdbc10dd9e2919f35a7477042dd6f02a85a8f0cf330d199  test/results/test0005-x86-binary
 283e2358d17fa6d6699d36e2dd16ae92825dec82dec6f515ed57a6e07c2ae126  test/results/test0006-aarch64-binary
 8925bb06ef69c70aac7749162d683e8da200a64a7c8437dd1e46b5e98057efb5  test/results/test0006-amd64-binary
 f8134ad470e5e044aef91ee72882111a750162b1b4ebdb8a4027e548126a1ea3  test/results/test0006-armv7l-binary
 285e9916e79075d4a4b5cfc947cc5d27df44edc9ebe091fae1095efd3a39110f  test/results/test0006-knight-native-binary
-e0e08f8aa9014fb9856c1198c2c3cdfe0e4ce42c64317877e82f56a4c078ceea  test/results/test0006-knight-posix-binary
+4d90b082711dd7108e261d9acb353793e53e97b3c0bb00275d43a2bcb6ea34d0  test/results/test0006-knight-posix-binary
 2fdab9370f3dca78c682f3334f393fb4a2d68c51f901006abe826b2b559cedab  test/results/test0006-x86-binary
 d65943dfce2047da4f2e6827ef484ab92f5369ee0d7d2e2d4a7e1c37b4dbaead  test/results/test0007-aarch64-binary
 cfa4382e0e3edd23ed8a292fa8e8630ac3ca90eb424e4fd241f3509705dd7943  test/results/test0007-amd64-binary
 876a38b259618a2c30e681c3f8ed624d9fd2a2873cb1e70dc826c444a004d535  test/results/test0007-armv7l-binary
 dc543f40901704ce9f352308c7759c8b581395f8683cfa248a03410dc3dc24bd  test/results/test0007-knight-native-binary
-3095d9a11eddbc875f13051825eef622cfc08fe1f93963c00c32af155982f480  test/results/test0007-knight-posix-binary
+fffb165db40690ad5528028cb46f124bf1dab16e616b78fa037becc4428ac200  test/results/test0007-knight-posix-binary
 de50c7139b401b684d34d9365f62301dd168a3a0c97e7cf325d84b7c0ca0af74  test/results/test0007-x86-binary
 92e05eff2ad5a0eb414c916573bf75fadbfcd758fe0ab7f85d65de7ab3973518  test/results/test0008-aarch64-binary
 ab6c8c172b61d24374f1a387d1d02aadf3fab69c32f9d47c311928750725a2d4  test/results/test0008-amd64-binary
 56765c0450f35869f2a7cfeab39b4e52b1a3a94f69c3ee52ad4bd42a1df3dfe8  test/results/test0008-armv7l-binary
 b54dd7a53e4e7619e7fe1761b827cfdf0c24b2317084ec7c06a7403c5d51c651  test/results/test0008-knight-native-binary
-3ea254522d01978f53a5ce8f88f145afdc1fec447bfc5e3ffc3057ab6968a07b  test/results/test0008-knight-posix-binary
+1d5a1d4f3197d1a0d6cc23fd681313fedfa450d402a1e1a25e47bacf5ee8241c  test/results/test0008-knight-posix-binary
 f741233af242dba7df5e1c199c0c2f51ead1df049d3bd872c52d81feaaccb6af  test/results/test0008-x86-binary
 51a2f9653a1658c02d5c6b9810293f722af4abe9576ad1eae5a501d7b47e9389  test/results/test0009-aarch64-binary
 47cfa71149eda9ed06766a8f36d945e463380709d683afef648cd65741e2fa8f  test/results/test0009-amd64-binary
 b86182592a642cc2d5a1dafe0b46eaf8d444e19e20af5f0db5828c48fde1bcbd  test/results/test0009-armv7l-binary
 80583e4bd2c04eaec31d73dfd62ae3b65ff527e672eadef1a1d5a2deaf1ab84e  test/results/test0009-knight-native-binary
-8641f78d02563b94f82aa4cea7ae4e3f339672c7b1a2375f9e2add2e7dfe5643  test/results/test0009-knight-posix-binary
+a58141119dffc95a3906576b3cfec629374920886eaec5e7e8abc6f71ba0608e  test/results/test0009-knight-posix-binary
 17c4325c7553e03253d684f3ae8a48d1d62dd5db10af120b62d12d6eeb453a22  test/results/test0009-x86-binary
 009327de3b432a3030339c9f9de5aca793fe8a194af6b483ce0d8133d3290a11  test/results/test0010-aarch64-binary
 4694533fc4055a43b84e07912a5f8b9f7b49900e3904cd570fd186c51605726c  test/results/test0010-amd64-binary
 bd400ad4b047a5fd31605a2a426a9e2aad03e258bcbee769097d5b259fa57063  test/results/test0010-armv7l-binary
 defb9b8b7f97b2b41907bbf2b2e5fd9fec2beaad2b391a673fe766a97094e912  test/results/test0010-knight-native-binary
-a2f7358dad20b7a4c559482a14a46af13a1d6c6209f625bbfacb420a3afaba0a  test/results/test0010-knight-posix-binary
+971fedf695f5dea6d9eded00ebaab3f8da03d135256116e5c2f62df90e86dac2  test/results/test0010-knight-posix-binary
 b97d639f371d039040f79481ca146402225010dd777d32b2b1e06dbaccfc4464  test/results/test0010-x86-binary
 044340db280b63f03a985140831d54d09a475d710c005db34d73d2e66e94a7de  test/results/test0011-aarch64-binary
 5af8a955ad11680ccede59f6639d1fdad649d6b93b317c2ee1a889adbc141c9e  test/results/test0011-amd64-binary
 9cde965000c91e9fa477a1431fe1c13f87e6ce108491b12ec13971c4cc69f3fe  test/results/test0011-armv7l-binary
 e9d4eb00cd8e5ca882f15d158c61f033e0f2587d3040913cd5ea2f07174bdf30  test/results/test0011-knight-native-binary
-96372059b5d383029cd18dc9568748685bd3779e12a00a94edc89feebb2cc051  test/results/test0011-knight-posix-binary
+bc1e35c469c3c5fe7abffe58cdff3b1d8f185522a9ef3a391183f69d27da18a5  test/results/test0011-knight-posix-binary
 668b21d3eae0c0114e9dd406ab3f29d3977cd41a79bbe4bc806850048a6f2b34  test/results/test0011-x86-binary
 4dd3f41982047925225f0cf1213ed1cdee3b31c48e9d741a64407ecf3c50624c  test/results/test0012-aarch64-binary
 b3c9ad056a805bd85c619551d7d8f91fe24f34b354272fdd25d5ea2d66fde610  test/results/test0012-amd64-binary
 f09f1d4e8a0e59c3479c9582e3db52402b2492691381db5b19acde26ba25131d  test/results/test0012-armv7l-binary
 e3b8e624fcf532c703f01f50024e556fdae2b843b14360d579829a69282be15d  test/results/test0012-knight-native-binary
-8555f369851394ed134af7b85fd3d5e8de980193a691924a51eed3205a6dfb97  test/results/test0012-knight-posix-binary
+d4bd9ec4d6f6b355d5908f717e929f67ac7973883f21003c7c283145bb36d16e  test/results/test0012-knight-posix-binary
 32d27b8ceaa4560e7846ff4bff5ba06d6dd9590bada5f9eebc740bbb38842a7f  test/results/test0012-x86-binary
 cda109377b4a0e5f7d6d3a6c6092c4821c5964ed2cecfc4848a415c5ebe3eba3  test/results/test0013-aarch64-binary
 e748ba742bb5a3c0075d6662f0e89e0d9d42efd593419ad68bcd1d022b901ea6  test/results/test0013-amd64-binary
 ad7d5f186f72937b3876b163825f298a17ea8ff88f6bb76a597c765cff482310  test/results/test0013-armv7l-binary
 8ae4f182d3d79697e99b5c04437685c72bf83667618392a32884cc12a7d38e48  test/results/test0013-knight-native-binary
-a2a2308a472736f56530fc66016503f2ecda3072175728b9950baa42af588d0a  test/results/test0013-knight-posix-binary
+8c5ce71c1c3d8ff753f814471182ec34da9c2f7a11b7faba0aa728698f54a08e  test/results/test0013-knight-posix-binary
 c9ebe7a943a278a38212533b8e8e09a3e39279274fff7bfcae7b9faa0a4a7a4b  test/results/test0013-x86-binary
 7bf2fb3a9bd3681c108543a62fee9c785abcb1cebe660ef925b2bd3d6efd1cf1  test/results/test0014-aarch64-binary
 a98c419b04e1460fe014dc95bf9a6eae5b7e25b1c74ec81ed9787ee22dea0154  test/results/test0014-amd64-binary
 7c006449185eacb618edb73fb43c02d96560b406161ae6fd30f8dd2324ecf5d0  test/results/test0014-armv7l-binary
-9e731aeb4a7b9b65c83ef2e4c137c960bc371ddc28b172bfb55c2b7ccf9ffe35  test/results/test0014-knight-posix-binary
+0f4c41833435aad3be85f3d8cfd44370eff224b795d06c202c1c65f44c13157c  test/results/test0014-knight-posix-binary
 dc2e4a0a70e00c1ff337d7ae03a5e76483e98fab978213be6da878fa7b6676bd  test/results/test0014-x86-binary
 abc79f6cb6b5cd601cfca7e5ee03362b030ac50161456c4c80a74b59d68bd6b6  test/results/test0015-aarch64-binary
 992da6e6d2c08034707687fcf069713a420062bb7de788eb03c6929ba6969454  test/results/test0015-amd64-binary
 2d88c7ac91dfa80c8fece7371f63614fd25d6da0867a9a4f0ee38e94af6dd842  test/results/test0015-armv7l-binary
-b200e867ecfec96b33425e67e06cc553b68b5ea5ff8c8331964d56264bcd7de1  test/results/test0015-knight-posix-binary
+182b3d323a9dfe9570224c1d9d4c3153b45de9d54769672a61fa2fb0133d158c  test/results/test0015-knight-posix-binary
 5be75d79f6edf76d437a19a40d76e3079eebffeb62560989eb0270a2298db1b2  test/results/test0015-x86-binary
 7599f25c0974b264ff7d43f3f61d1bf0d125b23650f87dc523a51b15bba1bb02  test/results/test0016-aarch64-binary
 875db265d91e04bb2bba5228ec84f1fb5b2646607acecdfa1d1db45bc8cf5cc9  test/results/test0016-amd64-binary
 e628f452326144e009076c39897ed11bff792925a42c674fab73e8a41dac75c6  test/results/test0016-armv7l-binary
-9d47ad6f4124521063c0894e5219871ed0561320ba52910c58102bb4cea2b820  test/results/test0016-knight-posix-binary
+3c6b3e9702975c54ba1e418f1b2add6da378f01caa3934f53a76e31cab9344eb  test/results/test0016-knight-posix-binary
 a111c4c9b48eb773c72da1be72f04a37738eb23352b613862619c208157afd57  test/results/test0016-x86-binary
 84c92cd47db29282b3f09dd22e2b7b8499adf23a105a9d50ac19a0f7902bf931  test/results/test0017-aarch64-binary
 804d29fea80e21b04e2098c2866201d9f19e5757209488bb64382cb9205b12bb  test/results/test0017-amd64-binary
 754188c89fd8ca237eec1f8ec3cfdff48d2323fe20f994bfe20d1b67d60d5b46  test/results/test0017-armv7l-binary
 8aef1d611095930c3bf681cf11f95289743cdab6e8f0737b38f572c492a9d36c  test/results/test0017-knight-native-binary
-9ebaeb010fa8f6a563133bed52c76758f444dce9e79509958d44abcecc73013a  test/results/test0017-knight-posix-binary
+2ad6f276f32de0d3a9158aa662cec44c36cc04c717cf9d9b03fc24c81e67e250  test/results/test0017-knight-posix-binary
 4bec6725b35ac1295a843f5dc142cb8a48a1c14556855a075f3d878c48c0aa5d  test/results/test0017-x86-binary
 02f8a3631f1ec266de13fb233aa64ee486d43e11673e66f94b0e5a3f4aa73d2c  test/results/test0018-aarch64-binary
 a626c4961bb78e4c469c964516341684f783b928931cfeb9238b714401e7126d  test/results/test0018-amd64-binary
 c8917a882cf4eaf6c332ef35793aaf4a6a58ac075cb041ebc7e1290c3129cb58  test/results/test0018-armv7l-binary
 f31fbd190e6dceda05b33a71692926845127f4f73eab08a143a17b5f2611e6e3  test/results/test0018-knight-native-binary
-f3b5326969cb68a0f8e4e3e138af24e70114510dda2ad5a7cc27e608e4aecc9a  test/results/test0018-knight-posix-binary
+4f794e6dae2c21dc9ebe611a4be616d5c67f30b110ad7b7b81c0a19717c39932  test/results/test0018-knight-posix-binary
 1ccbc54c2a2a722107b7ba9d282d65c2d975541a33d615a5ddcf468281a29153  test/results/test0018-x86-binary
 1daea3056216afc8500c1de92df40dc8c6d5e3b0a15aa85015a9673a6b91b70c  test/results/test0019-aarch64-binary
 7c0fcc833a7c3a5b5d36cf389e9c72873a25843e10cb3cbb4f42b3cf875104aa  test/results/test0019-amd64-binary
 59eac9790e0026021612d485495ba558dd5d5122019b9b43259318c94856d3c5  test/results/test0019-armv7l-binary
-1e11972b0addb19aa820bc912a4412e430cc87e67dcf8ddd1ab441f142dd1302  test/results/test0019-knight-posix-binary
+9f7340c233db8d21ed37aa9c9b9998e7e9e3770df5c86a75411737af28f568d4  test/results/test0019-knight-posix-binary
 87b38ccee5606d23c5f6286defb0c83d9271cd361af879e9f5c38471b9f77ab7  test/results/test0019-x86-binary
 52d849336725092ab929ab372326b795b5810d159adc81c5a667bc0ed6c9d353  test/results/test0020-aarch64-binary
 5bf34266efdd7423733bc99a01c7e248110950e28dcc0cc768c189f286d6402a  test/results/test0020-amd64-binary
 1b0a548114f4e2d627049c5b64792701c8068bfdd33862af028374ab9f9cb3a1  test/results/test0020-armv7l-binary
 f1795d82f5d39e5d2995882a627c74fa972bc749675d4a294732f9285a5ae3c2  test/results/test0020-knight-native-binary
-d2e5a7672854bf190dd6e2f08081a5dbea22c08d77b4a62f76af68db033aea14  test/results/test0020-knight-posix-binary
+b7341a4196e4a66d563fdff36a0990544e011795554206828d4c15751a5fbd43  test/results/test0020-knight-posix-binary
 5fcb0cd39e5ddb0d50a3a5187a555d1cdf4e45b382b9ea418dcd87044c772a13  test/results/test0020-x86-binary
 de8c8105ec9eb9f3ca398e7efaba61a86c5022363ebe0a010502e667de0260c1  test/results/test0021-aarch64-binary
 2e6b091ef1a61085e2d72bdcc4a0f70665d1a7213c204d911d4fe4bc2d0e9a01  test/results/test0021-amd64-binary
 6d578501c5a8bdc342f2860576b0c66a129cbd4a20f1560bc3ce8f221db24999  test/results/test0021-armv7l-binary
-b598bb72387459874a458b203eb6883e5360de9fcf60124c7dea8caef6a3d472  test/results/test0021-knight-posix-binary
+7a2be9cc1306aed5be7a0f1652f3094754c959e39271e03513550ed1bebd66d0  test/results/test0021-knight-posix-binary
 03678678921abdee02400158fda39c11ec927b1077953b19be0df553fa7fe4cd  test/results/test0021-x86-binary
 ee7d18937cbd4033a638bec2334a84b43f2720f3bc214f580a92d445899bb7a5  test/results/test0022-aarch64-binary
 d4f57528efe1a879ea97aae42a2de4575beb44d074ee178b00af72ffd727c59e  test/results/test0022-amd64-binary
 34e4c59d0ec56bb9f9a944953fa5d99fd200d73c725f6dde45bac9e133476515  test/results/test0022-armv7l-binary
-a23a357cabc995330776fa01c7cf41978b100c36b0e3c76d1297db0e953c1bc3  test/results/test0022-knight-posix-binary
+9f09a88bec987bcfcce4a94c567202e1c7317e85f98f517ecb3e6e9b1830e9d5  test/results/test0022-knight-posix-binary
 c648e06c65d7dfb35f1dfd1b8749587905ded1c048c4d9a7953fe9fe271386a5  test/results/test0022-x86-binary
 7e88cd71f4751e164fb4a5c2c12cf2b1feb10ff8ed3fbd3537fdc1b19022ad5e  test/results/test0023-aarch64-binary
 2dfd739fda224674da364784c68ab4f261d28056c746c0588b1b65e37371c05a  test/results/test0023-amd64-binary
 3d135524be40b706a1379ac3b2f10fe342355d111b6c8e18c157dbff72a86611  test/results/test0023-armv7l-binary
-f793452848e538381213923ecbd209253fabe391bd56c03f4f95d3ce1c4d5982  test/results/test0023-knight-posix-binary
+39881dc53c57ac093a59e5efd6d0f2ea339568d8013b2c6e6d9ca945a5ecedb9  test/results/test0023-knight-posix-binary
 50ce03a63fd5d544e725d785abf6cf2cc8546b07cafee9ce73dc6328bfd878dc  test/results/test0023-x86-binary
 deb80d26727f797c397b927938360f846eb982dc0722903cb07947737332c443  test/results/test0024-aarch64-binary
 847326ee9a1bd6e9f0b8cc546218d0c9a97e8a021b366b1367cd595a63516d09  test/results/test0024-amd64-binary
@ -148,22 +148,22 @@ deb80d26727f797c397b927938360f846eb982dc0722903cb07947737332c443  test/results/t
 d27e36cc2f30f69bd8bb86cef41241fbe35bcace6a179f952dbb51853b995a35  test/results/test0100-aarch64-binary
 18afb2596647b6755d686f787aa6dd69998b2dc8ae87879edf90e32469ded986  test/results/test0100-amd64-binary
 174c5d09252e8056e1fbc11bb5bd637a5eeee26b7cf2867fa031c165209f4245  test/results/test0100-armv7l-binary
-7de66384bcf268d71f780853690e90cd12daebbb9227d3f0af7f51238185c690  test/results/test0100-knight-posix-binary
+ebecf1e841c9c6ef03eb656d8aa17722624728285df26db136c89a583f67f7b8  test/results/test0100-knight-posix-binary
 04fecc4f2ee31911f5900a2760cd568665a40f426e889f819beaf2b81c9967fb  test/results/test0100-x86-binary
 8c787dabe68043e0b96ff6d055ccfd30b68624d5d897571465ed6aca2d1931b7  test/results/test0101-aarch64-binary
 d2e805a7016845017d9d5e8f26c1e5e3c4b7570bfa434badd9abe62f8f14233f  test/results/test0101-amd64-binary
 63d96d4455dd2ae922a559e9ac202349c4ecdae908542256e96a3622c8eb7447  test/results/test0101-armv7l-binary
-d120df140cc77037e3d16d1aee7482d270f55660a594c19be91cddc66de687f7  test/results/test0101-knight-posix-binary
+195330cf34ca3e89506724fa4673b05d1895e5d33c845ef2ef8bb3620c9ade83  test/results/test0101-knight-posix-binary
 ea87d209b9f2c11c18916da2591f1509b857ba68776d7a3ff86b3d7b1302db63  test/results/test0101-x86-binary
 3dcca356b5059d55a7032f98fdbed7fcc0cbecca0b5aeae35e68806b89c6f3a0  test/results/test0102-aarch64-binary
 c995bf881a3745164cc28ed5b2ad239f954afa64bc85455561c9ab197f2291d1  test/results/test0102-amd64-binary
 1fd54fe07a9269be3b7cca64df32284dd01efb160bab6d5aa982f8f52c88e95f  test/results/test0102-armv7l-binary
-b7d9cbb37965dcd24fd69c06037c3f46e4c7a0338729224925275082d687a33e  test/results/test0102-knight-posix-binary
+f4e721cb873ef5f2d1140bf2fc2dc83f58b641b8e7efe3e8314816401aa00662  test/results/test0102-knight-posix-binary
 5f1e19bdb86c4320be6553a5160af6babbe25688c30a6e67db05d8bb645247b8  test/results/test0102-x86-binary
 42dd36b4f4975fdb432eb84bc908fbc818a19bc8b703c471bae68ed87b101a81  test/results/test0103-aarch64-binary
 cdcee7eb9b08f3d0eba59b68f4adafc714293c6387782f70f68c6d7349fb31fd  test/results/test0103-amd64-binary
 e286f97af6d1e54824416e4a1b842d6d9ca73ef805b0b5129bfeabce01642b55  test/results/test0103-armv7l-binary
-e0e387777249ec8abb841271544a74361207a4c347d304f87a1e5c5d22353a7a  test/results/test0103-knight-posix-binary
+dcafe5bc21227014b0377a445fcc9e7025babed62bfeb6eb6455d006392b07a6  test/results/test0103-knight-posix-binary
 897c47ec05e1f1b75ca433578b47692b27884cad7297eae901cf347d768717de  test/results/test0103-x86-binary
 9d25845442c0f97f5f597d9db210da7430ca291c2cb8730d8bb592080bb6c0a3  test/results/test0104-aarch64-binary
 001331e713b094e78cf4fe91811e7d573bdfbe96ce6faa27fc70c0cb04a710ea  test/results/test0104-amd64-binary
@ -177,7 +177,7 @@ ca9fdf7c6720b7aff8a37a60608b89bb4a6941aa323c7038e0bcbb01af9a568d  test/results/t
 447d78cd2526ef97cdf02f72bc2f492765f7c076c598cf3dbd3e8dd4507740b7  test/results/test0106-amd64-binary
 ba2e2e1bbe66fea15d5984678175229fcb0adc6faa394be2cfde8bea1d3026de  test/results/test0106-armv7l-binary
 698853b79efb30865a663c4863c050639eb21c7400008f7840830503928973d4  test/results/test0106-knight-native-binary
-45c2ba61dc209d7ffa39de9ff0f0a7f8f3ea4d7e38598c72f982fcaf9a05c84a  test/results/test0106-knight-posix-binary
+44d0b9e0433f12b5567ecddc9285b6a7d41ea646a7134e6fc3c394b4a973f6ba  test/results/test0106-knight-posix-binary
 1f83e1cbac44aabd9f87eae601e020b584b572e7edb738d6274972d6d100fa3c  test/results/test0106-x86-binary
 2acc8a2f5317cb809e0d523cb997e8ab91f90ac95881288d874ed9156a3dcfb4  test/results/test1000-aarch64-binary
 abac486fb04c067876058e16782f42e202f56cc8a013362e8a57743869f20aac  test/results/test1000-amd64-binary
--- a/test/test0000/hello-knight-posix.sh
+++ b/test/test0000/hello-knight-posix.sh
@ -30,23 +30,22 @@ bin/M2-Planet \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-core.M1 \
 	-f ${TMPDIR}/return.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/return.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/return.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0000-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0001/hello-knight-posix.sh
+++ b/test/test0001/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0001/library_call.c \
 	-o ${TMPDIR}/library_call.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/library_call.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/library_call.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/library_call.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0001-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0002/hello-knight-posix.sh
+++ b/test/test0002/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0002/if.c \
 	-o ${TMPDIR}/if.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/if.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/if.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/if.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0002-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0003/hello-knight-posix.sh
+++ b/test/test0003/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0003/constant.c \
 	-o ${TMPDIR}/constant.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/constant.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/constant.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/constant.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0003-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0004/hello-knight-posix.sh
+++ b/test/test0004/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0004/call.c \
 	-o ${TMPDIR}/call.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/call.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/call.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/call.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0004-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0005/hello-knight-posix.sh
+++ b/test/test0005/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0005/string.c \
 	-o ${TMPDIR}/string.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/string.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/string.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/string.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0005-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0006/hello-knight-posix.sh
+++ b/test/test0006/hello-knight-posix.sh
@ -24,30 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0006/for.c \
 	-o ${TMPDIR}/for.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/for.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/for.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/for.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0006-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0007/hello-knight-posix.sh
+++ b/test/test0007/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0007/do.c \
 	-o ${TMPDIR}/do.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/do.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/do.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/do.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0007-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0008/hello-knight-posix.sh
+++ b/test/test0008/hello-knight-posix.sh
@ -24,33 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/malloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0008/struct.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/struct.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/struct.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/struct.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/struct.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0008-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0009/hello-knight-posix.sh
+++ b/test/test0009/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0009/goto.c \
 	-o ${TMPDIR}/goto.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/goto.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/goto.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/goto.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0009-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0010/hello-knight-posix.sh
+++ b/test/test0010/hello-knight-posix.sh
@ -24,33 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/malloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0010/nested_struct.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/nested_struct.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/nested_struct.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/nested_struct.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/nested_struct.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0010-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0011/hello-knight-posix.sh
+++ b/test/test0011/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0011/break-do.c \
 	-o ${TMPDIR}/break-do.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/break-do.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/break-do.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/break-do.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0011-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0012/hello-knight-posix.sh
+++ b/test/test0012/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0012/break-for.c \
 	-o ${TMPDIR}/break-for.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/break-for.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/break-for.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/break-for.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0012-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0013/hello-knight-posix.sh
+++ b/test/test0013/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0013/break-while.c \
 	-o ${TMPDIR}/break-while.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/break-while.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/break-while.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/break-while.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0013-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0014/hello-knight-posix.sh
+++ b/test/test0014/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0014/basic_args.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/basic_args.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/basic_args.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/basic_args.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/basic_args.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0014-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0015/hello-knight-posix.sh
+++ b/test/test0015/hello-knight-posix.sh
@ -24,32 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/file.c \
-	-f test/common_knight/functions/putchar.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0015/file_read.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/file_read.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/file_read.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/file_read.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/file_read.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0015-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0016/hello-knight-posix.sh
+++ b/test/test0016/hello-knight-posix.sh
@ -24,32 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/file.c \
-	-f test/common_knight/functions/putchar.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0016/file_write.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/file_write.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/file_write.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/file_write.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/file_write.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0016-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0017/hello-knight-posix.sh
+++ b/test/test0017/hello-knight-posix.sh
@ -24,33 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_knight/functions/putchar.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0017/memset.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/memset.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/memset.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/memset.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/memset.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0017-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0018/hello-knight-posix.sh
+++ b/test/test0018/hello-knight-posix.sh
@ -24,33 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/file.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0018/math.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/math.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/math.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/math.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/math.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0018-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0019/hello-knight-posix.sh
+++ b/test/test0019/hello-knight-posix.sh
@ -24,38 +24,36 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/file.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
 	-f functions/file_print.c \
 	-f test/test0019/getopt.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/getopt.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/getopt.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/getopt.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/getopt.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0019-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0020/hello-knight-posix.sh
+++ b/test/test0020/hello-knight-posix.sh
@ -24,33 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/malloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0020/struct.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/struct.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/struct.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/struct.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/struct.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0020-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0021/hello-knight-posix.sh
+++ b/test/test0021/hello-knight-posix.sh
@ -24,39 +24,34 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/chdir.c \
-	-f test/common_knight/functions/malloc.c \
-	-f test/common_knight/functions/getcwd.c \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/file.c \
-	-f functions/calloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/match.c \
 	-f functions/file_print.c \
 	-f test/test0021/chdir.c \
-	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/chdir.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/chdir.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/chdir.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/chdir.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0021-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0022/hello-knight-posix.sh
+++ b/test/test0022/hello-knight-posix.sh
@ -24,37 +24,35 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/malloc.c \
-	-f test/common_knight/functions/file.c \
-	-f test/common_knight/functions/exit.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
-	-f functions/calloc.c \
 	-f functions/file_print.c \
 	-f test/test0022/continue.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/continue.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/continue.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/continue.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/continue.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0022-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0023/hello-knight-posix.sh
+++ b/test/test0023/hello-knight-posix.sh
@ -24,31 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/file.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0023/fseek.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/fseek.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/fseek.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/fseek.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/fseek.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0023-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0024/hello-knight-posix.sh
+++ b/test/test0024/hello-knight-posix.sh
@ -30,23 +30,22 @@ bin/M2-Planet \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-core.M1 \
 	-f ${TMPDIR}/return.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/return.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/return.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x0 \
+	--base-address 0x0 \
 	-o test/results/test0024-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test
--- a/test/test0100/hello-knight-posix.sh
+++ b/test/test0100/hello-knight-posix.sh
@ -24,36 +24,34 @@ mkdir -p ${TMPDIR}
 # Build the test
 ./bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/file.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f test/test0100/blood-elf.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/blood-elf.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/blood-elf.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/blood-elf.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/blood-elf.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0100-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0101/hello-knight-posix.sh
+++ b/test/test0101/hello-knight-posix.sh
@ -24,39 +24,36 @@ mkdir -p ${TMPDIR}
 # Build the test
 ./bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/file.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
-	-f test/common_knight/functions/stat.c \
 	-f test/test0101/hex2_linker.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/hex2_linker.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/hex2_linker.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/hex2_linker.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/hex2_linker.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0101-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0102/hello-knight-posix.sh
+++ b/test/test0102/hello-knight-posix.sh
@ -24,40 +24,38 @@ mkdir -p ${TMPDIR}
 # Build the test
 ./bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/file.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
 	-f functions/string.c \
 	-f functions/require.c \
 	-f test/test0102/M1-macro.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/M1-macro.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/M1-macro.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/M1-macro.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/M1-macro.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0102-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0103/hello-knight-posix.sh
+++ b/test/test0103/hello-knight-posix.sh
@ -24,37 +24,34 @@ mkdir -p ${TMPDIR}
 # Build the test
 ./bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/file.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_knight/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_knight/functions/uname.c \
 	-f functions/match.c \
 	-f test/test0103/get_machine.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/get_machine.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/get_machine.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/get_machine.hex2 \
 	|| exit 3

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/get_machine.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0103-knight-posix-binary \
-	--exec_enable \
 	|| exit 4

 # Ensure binary works if host machine supports test
--- a/test/test0106/hello-knight-posix.sh
+++ b/test/test0106/hello-knight-posix.sh
@ -24,34 +24,32 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture knight-posix \
-	-f test/common_knight/functions/putchar.c \
-	-f test/common_knight/functions/getchar.c \
-	-f test/common_knight/functions/exit.c \
-	-f test/common_knight/functions/malloc.c \
+	-f M2libc/knight/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/knight/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0106/cc500.c \
-	--bootstrap-mode \
 	-o ${TMPDIR}/cc0.M1 \
 	|| exit 1

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_knight/knight_defs.M1 \
-	-f test/common_knight/libc-core.M1 \
+	-f M2libc/knight/knight_defs.M1 \
+	-f M2libc/knight/libc-full.M1 \
 	-f ${TMPDIR}/cc0.M1 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
 	-o ${TMPDIR}/cc0.hex2 \
 	|| exit 2

 # Resolve all linkages
 hex2 \
-	-f test/common_knight/ELF-knight.hex2 \
+	-f M2libc/knight/ELF-knight.hex2 \
 	-f ${TMPDIR}/cc0.hex2 \
-	--BigEndian \
+	--big-endian \
 	--architecture knight-posix \
-	--BaseAddress 0x00 \
+	--base-address 0x00 \
 	-o test/results/test0106-knight-posix-binary \
-	--exec_enable \
 	|| exit 3

 # Ensure binary works if host machine supports test