From bcd0f498591521ddbcb43456142c8beab964a9f0 Mon Sep 17 00:00:00 2001 From: deesix Date: Fri, 15 Jan 2021 00:00:00 +0100 Subject: [PATCH] Use M2libc in all AArch64 tests < test1000 Finally test0021, now that M2libc has getcwd. See b83086642edc4ce8ce536bd1f1c996ddcadb7b00 --- test/test.answers | 2 +- test/test0021/hello-aarch64.sh | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/test/test.answers b/test/test.answers index 0c0ba27..5a72567 100644 --- a/test/test.answers +++ b/test/test.answers @@ -120,7 +120,7 @@ b29aca7f0b63659915fe431e290f821cf17071983613021aacb8985d376bb206 test/results/t f1795d82f5d39e5d2995882a627c74fa972bc749675d4a294732f9285a5ae3c2 test/results/test0020-knight-native-binary d2e5a7672854bf190dd6e2f08081a5dbea22c08d77b4a62f76af68db033aea14 test/results/test0020-knight-posix-binary 1183247a4f714b9d1b0ec78b40f49631df3769ae95b0303fa9996208193c4ec9 test/results/test0020-x86-binary -33f953a466ccf0e32a4d6fef6f3ad304a2c28c6195c68224def30198813b6d78 test/results/test0021-aarch64-binary +2df54593dfa57afa9e41f1b3194c493409dc880db1326d440757ba4c4b11afc2 test/results/test0021-aarch64-binary ad3cdef5615e8322c1785db33f19291491b4a23d5abffb436e8dd32fa01d86a5 test/results/test0021-amd64-binary bde72b7ec387c8c001ac8ad0ea4ad07800867ec2057cedfc50aef6434122ccd9 test/results/test0021-armv7l-binary b598bb72387459874a458b203eb6883e5360de9fcf60124c7dea8caef6a3d472 test/results/test0021-knight-posix-binary diff --git a/test/test0021/hello-aarch64.sh b/test/test0021/hello-aarch64.sh index 4cfdcf3..66b1df5 100755 --- a/test/test0021/hello-aarch64.sh +++ b/test/test0021/hello-aarch64.sh @@ -24,17 +24,14 @@ mkdir -p ${TMPDIR} # Build the test bin/M2-Planet \ --architecture aarch64 \ - -f test/common_aarch64/functions/chdir.c \ - -f test/common_aarch64/functions/malloc.c \ - -f test/common_aarch64/functions/getcwd.c \ - -f test/common_aarch64/functions/exit.c \ - -f test/common_aarch64/functions/file.c \ - -f functions/calloc.c \ + -f M2libc/AArch64/Linux/unistd.h \ + -f M2libc/stdlib.c \ + -f M2libc/AArch64/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_aarch64/aarch64_defs.M1 \ - -f test/common_aarch64/libc-core.M1 \ + -f M2libc/AArch64/aarch64_defs.M1 \ + -f M2libc/AArch64/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_aarch64/ELF-aarch64-debug.hex2 \ + -f M2libc/AArch64/ELF-aarch64-debug.hex2 \ -f ${TMPDIR}/chdir.hex2 \ --LittleEndian \ --architecture aarch64 \