Use M2libc in all amd64 tests < test1000

2021-01-21 00:00:00 +01:00 · 2021-01-21 00:00:00 +01:00 · 7860378b75
parent 55db771e29
commit 7860378b75
31 changed files with 244 additions and 231 deletions
--- a/test/test.answers
+++ b/test/test.answers
@ -5,43 +5,43 @@ deb80d26727f797c397b927938360f846eb982dc0722903cb07947737332c443  test/results/t
 4862ffbb8e6265bdbf3d5fd824f7b7581206a627f5e7fe83cf5b7f4b30b8ebd4  test/results/test0000-knight-posix-binary
 69c060eae9ffb12992d89eb02f066c517c5acfd1d9f80152e279fccce7b77f6a  test/results/test0000-x86-binary
 81c046e7716ab54844c4e4d385f800700892e1ebfbb50a70e513f88cf8917662  test/results/test0001-aarch64-binary
-1ebf146c5f4d559c320920a5d48d6132e34aaccf40953672a497e927cc60643b  test/results/test0001-amd64-binary
+37d5d5e3c361e39fcc305acb77f9ac7bebbfa58bb290b4fdcac70a8a4a11e801  test/results/test0001-amd64-binary
 3931eb2a60c7b7557d49281ef13fc19c099e2f379b024675f7a9d3a538db8d83  test/results/test0001-armv7l-binary
 bff3ae5a240cd319570ef0c81c499cea51c821bc1369456c23a4206e6072865e  test/results/test0001-knight-native-binary
 cbc443f9c13a93203b742386c6b2ac687cd152f218c54a5c865ca1984778fdec  test/results/test0001-knight-posix-binary
 760e92f9579fdd231f99240e117313c115b35c12f2ec17ace00acb8fa3283a78  test/results/test0001-x86-binary
 b2ee7296349dc9fbf0dd38f2e58fa055cef222cc056272f170c317d5483cab64  test/results/test0002-aarch64-binary
-6928b09f10e913ca1b71f129e4818e03e4a9df69b069cbd37350d932ceeb71dc  test/results/test0002-amd64-binary
+873a7e7e62e2a83d11e67816fd8ca374c359a3fe811dc5fb1b1654e018b44f40  test/results/test0002-amd64-binary
 7e1d419490320711bde399bc864e22f4528e586d1c0ad5f2c38a4f321d18356a  test/results/test0002-armv7l-binary
 b177407a336c5fe8ed31fc4c2f6e6f9160da8c3b166a1b6875dff5f3d9966e7c  test/results/test0002-knight-native-binary
 680036751e342224fd846968f34fed312d684652928f44bd1fcfcf8cb6c69565  test/results/test0002-knight-posix-binary
 54dd2d2006d049d250ccd3e90912365ee05838defc549e53402a352b3c41186a  test/results/test0002-x86-binary
 630a9aa911301ed224fb0449bc7d7ce0de3cae41f70dafe51d78dbbf4b8fe84a  test/results/test0003-aarch64-binary
-81d3da7fb3cd076284e08fee9350cfda19c0b2ee32437f8a48e074cfe9217316  test/results/test0003-amd64-binary
+0c36608fef860364cf72f4c9edbaf4cf808800bdc2883cda076563d6111ca301  test/results/test0003-amd64-binary
 db3224d382300bf2a1fe64332e21dc643b589c0e4915cfa2b0118cf3b23929b2  test/results/test0003-armv7l-binary
 5b64d3204ef384a664eb6d8ca665b48903f58b87409eec9571ff3d72384056eb  test/results/test0003-knight-native-binary
 3b42d5f1d02a2690ab800cf4b633db9b3c7eac57ad3f1e1c9072ffcb6ba2a7e3  test/results/test0003-knight-posix-binary
 1c57b8f613a9a3ade226b25407c5a00311f2c4e103d86c56d3f5a90f4775d28f  test/results/test0003-x86-binary
 41a2bc2b7fe603cd024964482cd030e9387219d767a9272259aab1a7230cf393  test/results/test0004-aarch64-binary
-4509b73974147e5ecd4062b0bfcbfd719fe6b59fa76eaaa1a21a70975a9ed267  test/results/test0004-amd64-binary
+1a58c4c37f024e731395b2521aaef7407c1f5725108531b00e20e87d6c95bf7d  test/results/test0004-amd64-binary
 b8a298cb5d05ab40d0a865e98b6b03d5bf398ae2b9e59b8e34084e9389334116  test/results/test0004-armv7l-binary
 17faf6968c97f4fb9ec53c5ab506def33501ba1aa6d3518b8d747b869663007c  test/results/test0004-knight-native-binary
 b21069bfb39e8e6f37ef2cfb0496506bc9596e83c73d8797714f602e626f1688  test/results/test0004-knight-posix-binary
 f79a26e349ef8beb447fddd3091c6fc448b040a4daff3cc48c58c39c3006d4e3  test/results/test0004-x86-binary
 f70ce96aa5c5c22fa5799622d8114031294ad69b1084867d4d1016bf18f8835c  test/results/test0005-aarch64-binary
-5c600a6d3dcb8dd4833789c6fdc5e2ed074da73ea8b67e4639f3327cc3592db9  test/results/test0005-amd64-binary
+9c39800e5fcc8e7db04ec06307f38db1503bacdeb0e67190327324475a3282ce  test/results/test0005-amd64-binary
 9ac4394512cb401e4f375920cbaafe98e2a69c14e6d9b143c421581bc0f96255  test/results/test0005-armv7l-binary
 66f964f025449632862eb190e668210a63535ae9d8c0dabde38c84f08f97b80b  test/results/test0005-knight-native-binary
 3e54a6270333eb17cba55ac6af43295cbf1a9f337d395f1d4126a11ea232e949  test/results/test0005-knight-posix-binary
 e61737d75d2ed0519412bd6360612eb7b1528952b3de12a27e74792bacb3d803  test/results/test0005-x86-binary
 27a03cf40b11832b20d73da89bcbad0c88ae07051b8ae6526b97325d82247915  test/results/test0006-aarch64-binary
-67b8b97a691b95b51d294eeee17c875dfd790c630def77dce0fecc243cd14a0b  test/results/test0006-amd64-binary
+353770574c21c399807d9757427423c8ed0fbfa37a39e2f8c78403b500673047  test/results/test0006-amd64-binary
 1c8ce34816801d5432f4d06cb247fb8572e21e8cdb326ebd5342879a2453580b  test/results/test0006-armv7l-binary
 285e9916e79075d4a4b5cfc947cc5d27df44edc9ebe091fae1095efd3a39110f  test/results/test0006-knight-native-binary
 e0e08f8aa9014fb9856c1198c2c3cdfe0e4ce42c64317877e82f56a4c078ceea  test/results/test0006-knight-posix-binary
 18939a0f44cb65c97f413bf0d8ff157ef56886425e66a47884d67e8840da0a5d  test/results/test0006-x86-binary
 c321961f689625dfca38710bab3d5579db447ee09142a5c0693ed89b25c4dd2a  test/results/test0007-aarch64-binary
-20681d9935c919ce876f27392060154d8f7a853bbce6df6f8e493e66496d2401  test/results/test0007-amd64-binary
+25fd8811b23072f10ef9f1d95735d1bfa572c1dcea9d3f59353daafad4140484  test/results/test0007-amd64-binary
 12706d068d962b93a2b54128adf2d6ab4fa6dd2bcee31ab6bea796c278b2f315  test/results/test0007-armv7l-binary
 dc543f40901704ce9f352308c7759c8b581395f8683cfa248a03410dc3dc24bd  test/results/test0007-knight-native-binary
 3095d9a11eddbc875f13051825eef622cfc08fe1f93963c00c32af155982f480  test/results/test0007-knight-posix-binary
@ -53,85 +53,85 @@ b54dd7a53e4e7619e7fe1761b827cfdf0c24b2317084ec7c06a7403c5d51c651  test/results/t
 3ea254522d01978f53a5ce8f88f145afdc1fec447bfc5e3ffc3057ab6968a07b  test/results/test0008-knight-posix-binary
 4611053b01d1c2ae451f8979122c1136cda14f24b4d4bb94a399c10906947fd4  test/results/test0008-x86-binary
 8a58d23e1e1224ba7e803a933edf3cbaeceba9b640bd18402a1b9816f4f506ff  test/results/test0009-aarch64-binary
-5de426db9e0cc0943563a5f2464010b1aa27d4b72677945dd237fc3311691906  test/results/test0009-amd64-binary
+f81f0314f833c3e50a1e0fd89f4d536a73b15cd54815d8f4903c9b816da547e5  test/results/test0009-amd64-binary
 5f037d86c6e0c352579ce223157963090fe56a72bf65467508f36fd3dd5bd7b2  test/results/test0009-armv7l-binary
 80583e4bd2c04eaec31d73dfd62ae3b65ff527e672eadef1a1d5a2deaf1ab84e  test/results/test0009-knight-native-binary
 8641f78d02563b94f82aa4cea7ae4e3f339672c7b1a2375f9e2add2e7dfe5643  test/results/test0009-knight-posix-binary
 7e073eac439a8aa7e8ec109eddd7104830cd38b7fe410b91e8050ea6dc32e9c7  test/results/test0009-x86-binary
 cbcfc7230b89000d72e7771e83863b9f0ef85adcbe7887f6db8a047d958d10c8  test/results/test0010-aarch64-binary
-2ee9411b7f04829e892b2a3c818bf21268d91e3d0fefc438f10e6d6b06802dfa  test/results/test0010-amd64-binary
+55b7d22da293b5a3690164029e086915f59bb8d7d87feb63fda167dd7bb96afb  test/results/test0010-amd64-binary
 17e884aa93ac8230f8d1e1388d315a5840f9883232bb8040eeee9e9dfdc53862  test/results/test0010-armv7l-binary
 defb9b8b7f97b2b41907bbf2b2e5fd9fec2beaad2b391a673fe766a97094e912  test/results/test0010-knight-native-binary
 a2f7358dad20b7a4c559482a14a46af13a1d6c6209f625bbfacb420a3afaba0a  test/results/test0010-knight-posix-binary
 df9a8884564339e469d5dc1bea19880f3865ebcd324abd1187c17c172c4a9c15  test/results/test0010-x86-binary
 024bda9d5fa5bfef65bcb0930473ea101f86e3d24e9ae057f5b67f7688513c69  test/results/test0011-aarch64-binary
-eea0efca30881a43444c2d7ade16ed8b5e66079910a77052c5ca290be4a3a90b  test/results/test0011-amd64-binary
+093db54c5d6c4dde5f8cfd168913bd3328843674810b464b55aeb16881e98d73  test/results/test0011-amd64-binary
 b28bce3cd08600951c0bfbc8e9493a9b1b3f5c11f5920099a8573ffdc814c740  test/results/test0011-armv7l-binary
 e9d4eb00cd8e5ca882f15d158c61f033e0f2587d3040913cd5ea2f07174bdf30  test/results/test0011-knight-native-binary
 96372059b5d383029cd18dc9568748685bd3779e12a00a94edc89feebb2cc051  test/results/test0011-knight-posix-binary
 91d60cba7c79e6d31542470f4a6978e428157a72f5362f70a2ecb03e95eccd03  test/results/test0011-x86-binary
 2726e0eb678ffbb9739ba717dbb7122e1ccc3e6dca781aa4241efbf6604a15e4  test/results/test0012-aarch64-binary
-c5c52f9b8be8f344913a505d1aa0c42a1d3118f66a780a33783d4cfd0fb73e25  test/results/test0012-amd64-binary
+076d49faaf9f98c4aa0ec7a52c7e9ded375fb23c8303efea994b6a9c770f37d4  test/results/test0012-amd64-binary
 92c194b98b704a9ea04ce32868f6e7df8121e13840409240c8aa0d7a20b9f4a4  test/results/test0012-armv7l-binary
 e3b8e624fcf532c703f01f50024e556fdae2b843b14360d579829a69282be15d  test/results/test0012-knight-native-binary
 8555f369851394ed134af7b85fd3d5e8de980193a691924a51eed3205a6dfb97  test/results/test0012-knight-posix-binary
 f6cef5d9ffd57496fc05fe4af6e3e71cc8383449bee58cb440dc16ac40c9d881  test/results/test0012-x86-binary
 bf096fe867e9c75d71cee641a4bbcf7501e399a3433aaa427f6c1fa3c8b97b13  test/results/test0013-aarch64-binary
-d6f8fc5c0c898f2f4a70aacdca44d8d7727a57c1525f18a297b7c85e55a2c866  test/results/test0013-amd64-binary
+3b47bf029dea35e59347caa653d23d8c478266f224b31e7511f0a0bbbd9fbbef  test/results/test0013-amd64-binary
 fb26bd9a45f829e843e619e1ed643eb4169019e444ac74a12872774d415bc237  test/results/test0013-armv7l-binary
 8ae4f182d3d79697e99b5c04437685c72bf83667618392a32884cc12a7d38e48  test/results/test0013-knight-native-binary
 a2a2308a472736f56530fc66016503f2ecda3072175728b9950baa42af588d0a  test/results/test0013-knight-posix-binary
 0c0efec42e93d781282c74d061174c9fa0d677c11d4a616b56ca55fea4f719f9  test/results/test0013-x86-binary
 601dbe1681ed007615952bdbaa30bab1f0fa8f0202f45b04991a2053172ae39b  test/results/test0014-aarch64-binary
-3fde6df916fcb273770ee83eb0bc757fe6dedd022cfbe6cb91641ff335f7e3fd  test/results/test0014-amd64-binary
+5fc768c4c9703f305f57fcf0bd6032321d5e5df73ae9095129e9b947dbacd2dc  test/results/test0014-amd64-binary
 390deb0728a6ee883ef4ccd4720041ee77a69d0d218b25403846704f6300d3e2  test/results/test0014-armv7l-binary
 9e731aeb4a7b9b65c83ef2e4c137c960bc371ddc28b172bfb55c2b7ccf9ffe35  test/results/test0014-knight-posix-binary
 e783d1a24a892f326ef8166d9fd0bf318d93fa7112b244973569e4332d9c5f0d  test/results/test0014-x86-binary
 019f87d11b96a42bd400717d3baee5cc8afdc71c69fafe1f3870eaa05f249982  test/results/test0015-aarch64-binary
-0aeb06505099217e667c75fa2560c1669546d0114430ac728970b8d5015fc526  test/results/test0015-amd64-binary
+1925b96d9036e2b62888dd12435e70b5b31925d67a5ea09ffd5cba074f63e41b  test/results/test0015-amd64-binary
 faa2be23f7e0e4ad26b047f040a1d05701d2ea808e3c5b2ca8396df13ddac282  test/results/test0015-armv7l-binary
 b200e867ecfec96b33425e67e06cc553b68b5ea5ff8c8331964d56264bcd7de1  test/results/test0015-knight-posix-binary
 053b8fbe43796a30af109b80313c257f3acf1c9bd5e5e699e7b996e99c26cf77  test/results/test0015-x86-binary
 9dbdf7d65a16ddf5c5ca6b457ae937434c3438fb32e85a6b12e605c55bf7acd9  test/results/test0016-aarch64-binary
-a392314cece371cfd14548a80ebcffb946d5fb5976a4232930d0cc6808d87044  test/results/test0016-amd64-binary
+f65f484e0ff8f5e10d5b4f40d987e92366059fda35c5e420d4bbb90cf06bd3be  test/results/test0016-amd64-binary
 853dcdc7389018f8ea01c7e8255b5b3e82ab999049753bd33bcc3c16ac697c4e  test/results/test0016-armv7l-binary
 9d47ad6f4124521063c0894e5219871ed0561320ba52910c58102bb4cea2b820  test/results/test0016-knight-posix-binary
 e4875f981f3b51627a2b17bd25f8f316bc37f8428263ebaeb5641e45b7def712  test/results/test0016-x86-binary
 f7fec8118d3067716f0e44267ed72924d8f34fdbd58051c40ca98eaf2426ba41  test/results/test0017-aarch64-binary
-bd70143ec9764bd5681c72e173b6baaca7a486c9330974ca82fb7e997249f572  test/results/test0017-amd64-binary
+28f8f46780cd67a50ce2780eab0b6665ceedbf1cb007f177bf6fbad73bb960ba  test/results/test0017-amd64-binary
 4618cba0ac8a2aa09c434388be9e2275cfb512c457a9f10e2ec64c06a3f4cf2c  test/results/test0017-armv7l-binary
 8aef1d611095930c3bf681cf11f95289743cdab6e8f0737b38f572c492a9d36c  test/results/test0017-knight-native-binary
 9ebaeb010fa8f6a563133bed52c76758f444dce9e79509958d44abcecc73013a  test/results/test0017-knight-posix-binary
 43124b01045e81627d7f5fd4aedb22166fa5f51790b3e5497e0d796241ee7902  test/results/test0017-x86-binary
 d0246ffd9a0a2eb64b931b8ba5eed97a39019dcac04f34946601e7aeba25a47a  test/results/test0018-aarch64-binary
-0e5a7d447471d097c65182ac5512a0c58f90ff151d1b55870b7faa8897baa213  test/results/test0018-amd64-binary
+ae28c929b7456ec11209f9811bb1a2675add640440f13c31ad454a9fb8c5ae7f  test/results/test0018-amd64-binary
 2ad21d7b2536304f9effd97d8614036b0d453a10ba4da3c09b490d6447271a42  test/results/test0018-armv7l-binary
 f31fbd190e6dceda05b33a71692926845127f4f73eab08a143a17b5f2611e6e3  test/results/test0018-knight-native-binary
 f3b5326969cb68a0f8e4e3e138af24e70114510dda2ad5a7cc27e608e4aecc9a  test/results/test0018-knight-posix-binary
 6fed48128eff90728f00e8f7000a66befd92e2d941e65f8b5df5dba709af1d2d  test/results/test0018-x86-binary
 7882e32500ee47bb314c441b51d0b2303571ce12af330b836bc078dc1f6f70aa  test/results/test0019-aarch64-binary
-354b3ae2e2265f8aff7ef43569dbca4312b0d389ef26b3530ad7efcb9c1d7013  test/results/test0019-amd64-binary
+59def08c4d64b785fb273c1da439edea4aad87f6e9cc5802f31edfde2e0c5831  test/results/test0019-amd64-binary
 35f88e82c2ff88176074ec812f1fdde7cf83a8940bd1dc5cabf8db8bd6793004  test/results/test0019-armv7l-binary
 1e11972b0addb19aa820bc912a4412e430cc87e67dcf8ddd1ab441f142dd1302  test/results/test0019-knight-posix-binary
 9aee7ed4bec5e46b9bfc820f6d4392e5d9d7b8393abc5e98f7c2e987f366ebb0  test/results/test0019-x86-binary
 8c71a77628fd5e092cbb963cf36d8fa9d0ebb1285045af8f37e16d8a7c964742  test/results/test0020-aarch64-binary
-6b2956b106dd16bb55d8d011b48e674ee3b70bbb0bb83efadca01d446666e21e  test/results/test0020-amd64-binary
+ac05ba913be389ee9bb4fe76b6fce2c8f9a38408327cb20d46a2ec49bdbecb51  test/results/test0020-amd64-binary
 b29aca7f0b63659915fe431e290f821cf17071983613021aacb8985d376bb206  test/results/test0020-armv7l-binary
 f1795d82f5d39e5d2995882a627c74fa972bc749675d4a294732f9285a5ae3c2  test/results/test0020-knight-native-binary
 d2e5a7672854bf190dd6e2f08081a5dbea22c08d77b4a62f76af68db033aea14  test/results/test0020-knight-posix-binary
 1183247a4f714b9d1b0ec78b40f49631df3769ae95b0303fa9996208193c4ec9  test/results/test0020-x86-binary
 2df54593dfa57afa9e41f1b3194c493409dc880db1326d440757ba4c4b11afc2  test/results/test0021-aarch64-binary
-ad3cdef5615e8322c1785db33f19291491b4a23d5abffb436e8dd32fa01d86a5  test/results/test0021-amd64-binary
+25fc5d4f89b2f48d40c6968b94c169536a9e4d64d3abd380139b62ff875d1cec  test/results/test0021-amd64-binary
 bde72b7ec387c8c001ac8ad0ea4ad07800867ec2057cedfc50aef6434122ccd9  test/results/test0021-armv7l-binary
 b598bb72387459874a458b203eb6883e5360de9fcf60124c7dea8caef6a3d472  test/results/test0021-knight-posix-binary
 77231592a7933196a9899f5d6d910aaacdcd02be83419b14f622c1034b136811  test/results/test0021-x86-binary
 8708921a877217f317b8a6f749dabb804cc47861311189efb1284685db1b9656  test/results/test0022-aarch64-binary
-4233f5b48b96e98bd83d30e63ce22420d6fe82dbebe9ac261c28760515efdfe8  test/results/test0022-amd64-binary
+79614eeaf57b0f7ab803b1752173fe38f96b2591add5470c90c5f6e4c447508b  test/results/test0022-amd64-binary
 2d63c3a5a2c5b5ae2ea2e93c430027b4b418e229a963c66b9a3bc34307a55eba  test/results/test0022-armv7l-binary
 a23a357cabc995330776fa01c7cf41978b100c36b0e3c76d1297db0e953c1bc3  test/results/test0022-knight-posix-binary
 7e9b280039396df0873d2a211c989da0619cf7ba4a8b2ab4169db125feae1e25  test/results/test0022-x86-binary
 1e204bd0695b22dfdc9f4f70e483e1c3d1f38330b508394d7303ffe30f73e0c4  test/results/test0023-aarch64-binary
-0c31258687156c27e6792d6bea30b36f79d2626784b928869cb827a28abf6e31  test/results/test0023-amd64-binary
+efa410ff45045f330d2497232b13d9f83b5ca7882878f22e9d1d285afb5a762a  test/results/test0023-amd64-binary
 d7b2ad248521de84f3b4d8194ab6b330f3e5fda0043368f57be0d30f9949172b  test/results/test0023-armv7l-binary
 f793452848e538381213923ecbd209253fabe391bd56c03f4f95d3ce1c4d5982  test/results/test0023-knight-posix-binary
 b86fc421e50fd551ab3d6296551b3ed03821f6f134906575d932516b26a40285  test/results/test0023-x86-binary
@ -146,35 +146,35 @@ deb80d26727f797c397b927938360f846eb982dc0722903cb07947737332c443  test/results/t
 82044e3e3b36092327094fe1aa4e14758207734987b546180dad2e2536d39aeb  test/results/test0025-armv7l-binary
 e7321aadf4dd89d34e5fe0ae3efd31b84488003b5caddd14443363b09d0af709  test/results/test0025-x86-binary
 28353f8a2c920af49a89a302d4910bd8df81a3147ca7c2c197fa5487ebb6d180  test/results/test0100-aarch64-binary
-4d4d7dc249a4fc1788f4443a7a5feba51392a73dc1b80297a510cbca41afd71e  test/results/test0100-amd64-binary
+10015115d5ff176bf6be6eb170d8f89cfb23d7052574aac3dd80773298f058df  test/results/test0100-amd64-binary
 98ebb4ac496ed255d769383d027b0bf358f280b248a0994b30c047d2d5506ec4  test/results/test0100-armv7l-binary
 7de66384bcf268d71f780853690e90cd12daebbb9227d3f0af7f51238185c690  test/results/test0100-knight-posix-binary
 a783829261dd45186da513e04bb727b6647e5712ccd11e8b19c33a286cbfc975  test/results/test0100-x86-binary
 cfd01fd7742cc874faea013f7c32f02c1181caf9c44ede7bcba79a22cfc037ec  test/results/test0101-aarch64-binary
-cce24980c8557906660d6d404d6882e5a690c178afe9f097ba653facc254fdf5  test/results/test0101-amd64-binary
+5ca0c7f08abf61dd8a1aae191e609453110b5437fb8a6a09d6ed2281e8d0dbc3  test/results/test0101-amd64-binary
 252237eaaa9940b65aaf82a3667e8c59ccb78222c58e0b66b9a1dff6ee2e72e8  test/results/test0101-armv7l-binary
 d120df140cc77037e3d16d1aee7482d270f55660a594c19be91cddc66de687f7  test/results/test0101-knight-posix-binary
 cc36cf1c0a0ba6fb9e6578763266b1d3ef6580df3b2b3dad2ac03f0c98145e8b  test/results/test0101-x86-binary
 b2d2516f9a91afffed4c0f2cc3aa8dd8c810ff1579a9c5685a0b6f00a5f4a71b  test/results/test0102-aarch64-binary
-ff2c20511abe644022288d665f84282d66aa411545129cfa7d9a6603a796071d  test/results/test0102-amd64-binary
+e1071a027f2ea4557660c123c6974db0ee020672ca707675f310ab49805c3b55  test/results/test0102-amd64-binary
 1fdfff755396b9b6fd69b0e745d7625f058ff844319dff7940640f4de3593bde  test/results/test0102-armv7l-binary
 b7d9cbb37965dcd24fd69c06037c3f46e4c7a0338729224925275082d687a33e  test/results/test0102-knight-posix-binary
 310cfcef1f41ba6f9703bedbb076c528448b1523958b980aacb2e1aa6109b2a1  test/results/test0102-x86-binary
 04246ad047c62f29c393477d85c17a3624ba96537dc22593c763b9e8c99c1bc2  test/results/test0103-aarch64-binary
-f2114b5217c12952a85d580ad5914dd679888d93d176ee132ace9e8773916b3b  test/results/test0103-amd64-binary
+9d5fabe2d57375a10debe0088ca28dde8401436f2cefade771431625c1f40427  test/results/test0103-amd64-binary
 79cbb69a747b07d729db736bc177b52b344106387831a0210ff18fce92edf1cc  test/results/test0103-armv7l-binary
 e0e387777249ec8abb841271544a74361207a4c347d304f87a1e5c5d22353a7a  test/results/test0103-knight-posix-binary
 e96a60d11b7e8261100b4f1f87c85b1c2432b43e4520fb4909e7cdafcae69b7c  test/results/test0103-x86-binary
 f54b4aeadfe100dd18cfc04e006b82c5251d7c1e01c9995be6ac039fda514837  test/results/test0104-aarch64-binary
-bfd053ab2b0fa1a353ac5ff6bd2b044451404d04316bcf417698918b19d05e38  test/results/test0104-amd64-binary
+6d208021d25f06c214c2999d645260c2733dd1fe05b9cc5278167b6098434363  test/results/test0104-amd64-binary
 846ab4a92ab210a1bed125420fc9d5a92f44d747e24d7364ba0b21e30aeb8a2b  test/results/test0104-armv7l-binary
 43ac5afe65b840f42d6360be3a212ed0d785876ae8f8998906c62988ad156b7d  test/results/test0104-x86-binary
 5ebf8f644ed0dc87eab2ed56a7c48efa1b265de1935e75ab440f1a1a29efadb0  test/results/test0105-aarch64-binary
-0d90fa4a6d7d750bd64886f850569e4924c0887c9ef057a5cdf66c03319a4936  test/results/test0105-amd64-binary
+9e1982f8cbac133761da68a9aeada26a1125b9c118842a44d5bce6e8037276fe  test/results/test0105-amd64-binary
 7ae287efefe4abeb9db6730da8c4db9273475b9666371bc4ea6c58c7e0486b74  test/results/test0105-armv7l-binary
 c279f96f7436019c5a3343c4835b4610edfabb6c6292babbf187d819f70e251d  test/results/test0105-x86-binary
 29391746e9af13989334ee28b4822ea52ca2b8322c0b3b7ee73c3c7c09bcb47d  test/results/test0106-aarch64-binary
-503b06b04ca1c5452489e20ff6b5288e592d74f312515246e6d992d2cb0f36fc  test/results/test0106-amd64-binary
+e168961712ff05d05115b4e1d356797e7b3c2072ad51243f55462f12a874bd54  test/results/test0106-amd64-binary
 a2a83f42119e646b389b98647cf6cf2aa9597185997c9453db746178c8c4c0bf  test/results/test0106-armv7l-binary
 698853b79efb30865a663c4863c050639eb21c7400008f7840830503928973d4  test/results/test0106-knight-native-binary
 45c2ba61dc209d7ffa39de9ff0f0a7f8f3ea4d7e38598c72f982fcaf9a05c84a  test/results/test0106-knight-posix-binary
--- a/test/test0001/hello-amd64.sh
+++ b/test/test0001/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/library_call.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/library_call.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0002/hello-amd64.sh
+++ b/test/test0002/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/if.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/if.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0003/hello-amd64.sh
+++ b/test/test0003/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/constant.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/constant.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0004/hello-amd64.sh
+++ b/test/test0004/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/call.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/call.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0005/hello-amd64.sh
+++ b/test/test0005/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/string.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/string.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0006/hello-amd64.sh
+++ b/test/test0006/hello-amd64.sh
@ -24,15 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/for.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -41,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/for.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0007/hello-amd64.sh
+++ b/test/test0007/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/do.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/do.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0009/hello-amd64.sh
+++ b/test/test0009/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/goto.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/goto.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0010/hello-amd64.sh
+++ b/test/test0010/hello-amd64.sh
@ -24,18 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/malloc.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/nested_struct.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -44,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/nested_struct.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0011/hello-amd64.sh
+++ b/test/test0011/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/break-do.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/break-do.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0012/hello-amd64.sh
+++ b/test/test0012/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/break-for.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/break-for.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0013/hello-amd64.sh
+++ b/test/test0013/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/break-while.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/break-while.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0014/hello-amd64.sh
+++ b/test/test0014/hello-amd64.sh
@ -24,16 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/basic_args.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -42,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/basic_args.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0015/hello-amd64.sh
+++ b/test/test0015/hello-amd64.sh
@ -24,17 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/putchar.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/file_read.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -43,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/file_read.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0016/hello-amd64.sh
+++ b/test/test0016/hello-amd64.sh
@ -24,17 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/putchar.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/file_write.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -43,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/file_write.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0017/hello-amd64.sh
+++ b/test/test0017/hello-amd64.sh
@ -24,18 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_amd64/functions/putchar.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/memset.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -44,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/memset.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0018/hello-amd64.sh
+++ b/test/test0018/hello-amd64.sh
@ -24,18 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/math.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -44,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/math.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0019/hello-amd64.sh
+++ b/test/test0019/hello-amd64.sh
@ -24,23 +24,22 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/getopt.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -49,7 +48,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/getopt.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0020/hello-amd64.sh
+++ b/test/test0020/hello-amd64.sh
@ -24,18 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/malloc.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/struct.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -44,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/struct.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0021/hello-amd64.sh
+++ b/test/test0021/hello-amd64.sh
@ -24,17 +24,14 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/chdir.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f test/common_amd64/functions/getcwd.c \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
-	-f functions/calloc.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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

@ -48,8 +45,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/chdir.M1 \
 	-f ${TMPDIR}/chdir-footer.M1 \
 	--LittleEndian \
@ -59,7 +56,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/chdir.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0022/hello-amd64.sh
+++ b/test/test0022/hello-amd64.sh
@ -24,16 +24,15 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/malloc.c \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/exit.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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 \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/continue.M1 \
 	|| exit 1

@ -47,8 +46,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/continue.M1 \
 	-f ${TMPDIR}/continue-footer.M1 \
 	--LittleEndian \
@ -58,7 +57,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/continue.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0023/hello-amd64.sh
+++ b/test/test0023/hello-amd64.sh
@ -24,10 +24,12 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0023/fseek.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/fseek.M1 \
 	|| exit 1

@ -41,8 +43,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/fseek.M1 \
 	-f ${TMPDIR}/fseek-footer.M1 \
 	--LittleEndian \
@ -52,7 +54,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/fseek.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0024/hello-amd64.sh
+++ b/test/test0024/hello-amd64.sh
@ -30,8 +30,8 @@ bin/M2-Planet \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-core.M1 \
 	-f ${TMPDIR}/return.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -40,7 +40,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/return.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0100/hello-amd64.sh
+++ b/test/test0100/hello-amd64.sh
@ -22,17 +22,16 @@ TMPDIR="test/test0100/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f test/test0100/blood-elf.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/blood-elf.M1 \
 	|| exit 1

@ -46,8 +45,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/blood-elf.M1 \
 	-f ${TMPDIR}/blood-elf-footer.M1 \
 	--LittleEndian \
@ -57,7 +56,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/blood-elf.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0101/hello-amd64.sh
+++ b/test/test0101/hello-amd64.sh
@ -22,20 +22,18 @@ TMPDIR="test/test0101/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
-	-f test/common_amd64/functions/stat.c \
 	-f test/test0101/hex2_linker.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/hex2_linker.M1 \
 	|| exit 1

@ -49,8 +47,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/hex2_linker.M1 \
 	-f ${TMPDIR}/hex2_linker-footer.M1 \
 	--LittleEndian \
@ -60,7 +58,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/hex2_linker.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
@ -79,7 +77,7 @@ then

 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0101-amd64-binary -f test/common_x86/ELF-i386.hex2 \
+	./test/results/test0101-amd64-binary -f M2libc/x86/ELF-x86.hex2 \
 	-f test/test0101/test.hex2 \
 	--LittleEndian \
 	--architecture x86 \
--- a/test/test0102/hello-amd64.sh
+++ b/test/test0102/hello-amd64.sh
@ -22,13 +22,13 @@ TMPDIR="test/test0102/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
@ -36,7 +36,6 @@ mkdir -p ${TMPDIR}
 	-f functions/require.c \
 	-f test/test0102/M1-macro.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/M1-macro.M1 \
 	|| exit 1

@ -50,8 +49,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/M1-macro.M1 \
 	-f ${TMPDIR}/M1-macro-footer.M1 \
 	--LittleEndian \
@ -61,7 +60,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/M1-macro.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
@ -80,8 +79,8 @@ then

 	# Verify that the resulting file works
 	./test/results/test0102-amd64-binary -f \
-		test/common_x86/x86_defs.M1 \
-		-f test/common_x86/libc-core.M1 \
+		M2libc/x86/x86_defs.M1 \
+		-f M2libc/x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
--- a/test/test0103/hello-amd64.sh
+++ b/test/test0103/hello-amd64.sh
@ -22,18 +22,16 @@ TMPDIR="test/test0103/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
-	-f test/common_amd64/functions/uname.c \
 	-f functions/match.c \
 	-f test/test0103/get_machine.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/get_machine.M1 \
 	|| exit 1

@ -47,8 +45,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/get_machine.M1 \
 	-f ${TMPDIR}/get_machine-footer.M1 \
 	--LittleEndian \
@ -58,7 +56,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/get_machine.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0104/hello-amd64.sh
+++ b/test/test0104/hello-amd64.sh
@ -22,21 +22,18 @@ TMPDIR="test/test0104/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/file.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f functions/file_print.c \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/match.c \
 	-f functions/in_set.c \
 	-f functions/numerate_number.c \
-	-f test/common_amd64/functions/fork.c \
-	-f test/common_amd64/functions/execve.c \
 	-f test/test0104/kaem.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/kaem.M1 \
 	|| exit 1

@ -50,8 +47,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/kaem.M1 \
 	-f ${TMPDIR}/kaem-footer.M1 \
 	--LittleEndian \
@ -61,7 +58,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/kaem.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0105/hello-amd64.sh
+++ b/test/test0105/hello-amd64.sh
@ -22,14 +22,14 @@ TMPDIR="test/test0105/tmp-amd64"
 mkdir -p ${TMPDIR}

 # Build the test
-./bin/M2-Planet \
+bin/M2-Planet \
 	--architecture amd64 \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/Linux/fcntl.h \
+	-f M2libc/stdio.c \
 	-f test/test0105/lisp.h \
-	-f test/common_amd64/functions/malloc.c \
-	-f functions/calloc.c \
 	-f functions/in_set.c \
-	-f test/common_amd64/functions/file.c \
-	-f test/common_amd64/functions/exit.c \
 	-f functions/numerate_number.c \
 	-f functions/match.c \
 	-f functions/file_print.c \
@ -39,7 +39,6 @@ mkdir -p ${TMPDIR}
 	-f test/test0105/lisp_print.c \
 	-f test/test0105/lisp_read.c \
 	--debug \
-	--bootstrap-mode \
 	-o ${TMPDIR}/lisp.M1 \
 	|| exit 1

@ -53,8 +52,8 @@ blood-elf \

 # Macro assemble with libc written in M1-Macro
 M1 \
-	-f test/common_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/lisp.M1 \
 	-f ${TMPDIR}/lisp-footer.M1 \
 	--LittleEndian \
@ -64,7 +63,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64-debug.hex2 \
+	-f M2libc/amd64/ELF-amd64-debug.hex2 \
 	-f ${TMPDIR}/lisp.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
--- a/test/test0106/hello-amd64.sh
+++ b/test/test0106/hello-amd64.sh
@ -24,19 +24,18 @@ mkdir -p ${TMPDIR}
 # Build the test
 bin/M2-Planet \
 	--architecture amd64 \
-	-f test/common_amd64/functions/putchar.c \
-	-f test/common_amd64/functions/getchar.c \
-	-f test/common_amd64/functions/exit.c \
-	-f test/common_amd64/functions/malloc.c \
+	-f M2libc/amd64/Linux/unistd.h \
+	-f M2libc/stdlib.c \
+	-f M2libc/amd64/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_amd64/amd64_defs.M1 \
-	-f test/common_amd64/libc-core.M1 \
+	-f M2libc/amd64/amd64_defs.M1 \
+	-f M2libc/amd64/libc-full.M1 \
 	-f ${TMPDIR}/cc0.M1 \
 	--LittleEndian \
 	--architecture amd64 \
@ -45,7 +44,7 @@ M1 \

 # Resolve all linkages
 hex2 \
-	-f test/common_amd64/ELF-amd64.hex2 \
+	-f M2libc/amd64/ELF-amd64.hex2 \
 	-f ${TMPDIR}/cc0.hex2 \
 	--LittleEndian \
 	--architecture amd64 \