Skip to content

Commit 9a794d0

Browse files
committed
[ATfE] Enable AArch64 tests on QEMU
Enabled in llvm/llvm-project#154789
1 parent 344a3a1 commit 9a794d0

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

arm-software/embedded/arm-multilib/json/variants/aarch64a_exn_rtti_unaligned.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"llvmlibc": {
3434
"ENABLE_CXX_LIBS": "ON",
35-
"ENABLE_LIBC_TESTS": "OFF",
35+
"ENABLE_LIBC_TESTS": "ON",
3636
"ENABLE_COMPILER_RT_TESTS": "OFF",
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}

arm-software/embedded/arm-multilib/json/variants/aarch64a_soft_nofp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"llvmlibc": {
3434
"ENABLE_CXX_LIBS": "ON",
35-
"ENABLE_LIBC_TESTS": "OFF",
35+
"ENABLE_LIBC_TESTS": "ON",
3636
"ENABLE_COMPILER_RT_TESTS": "OFF",
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}

arm-software/embedded/arm-multilib/json/variants/aarch64a_soft_nofp_exn_rtti.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"llvmlibc": {
3434
"ENABLE_CXX_LIBS": "ON",
35-
"ENABLE_LIBC_TESTS": "OFF",
35+
"ENABLE_LIBC_TESTS": "ON",
3636
"ENABLE_COMPILER_RT_TESTS": "OFF",
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}

arm-software/embedded/arm-multilib/json/variants/aarch64a_unaligned.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"llvmlibc": {
3434
"ENABLE_CXX_LIBS": "ON",
35-
"ENABLE_LIBC_TESTS": "OFF",
35+
"ENABLE_LIBC_TESTS": "ON",
3636
"ENABLE_COMPILER_RT_TESTS": "OFF",
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}

arm-software/embedded/arm-runtimes/CMakeLists.txt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,19 @@ endif()
655655
###############################################################################
656656

657657
if(C_LIBRARY STREQUAL llvmlibc)
658-
set(test_cmd
659-
"qemu-system-arm -M ${QEMU_MACHINE} -cpu ${QEMU_CPU} ${QEMU_PARAMS} \
660-
-chardev stdio$<COMMA>mux=on$<COMMA>id=stdio0 \
661-
-semihosting-config enable=on$<COMMA>chardev=stdio0$<COMMA>arg=program-name \
662-
-monitor none -serial none -nographic -device loader$<COMMA>file=@BINARY@$<COMMA>cpu-num=0")
663-
658+
if(TARGET_ARCH MATCHES "^aarch64")
659+
set(test_cmd
660+
"qemu-system-aarch64 -M ${QEMU_MACHINE} -cpu ${QEMU_CPU} \
661+
-chardev stdio$<COMMA>mux=on$<COMMA>id=stdio0 \
662+
-semihosting-config enable=on$<COMMA>chardev=stdio0$<COMMA>arg=program-name \
663+
-monitor none -serial none -nographic -kernel @BINARY@")
664+
else()
665+
set(test_cmd
666+
"qemu-system-arm -M ${QEMU_MACHINE} -cpu ${QEMU_CPU} ${QEMU_PARAMS} \
667+
-chardev stdio$<COMMA>mux=on$<COMMA>id=stdio0 \
668+
-semihosting-config enable=on$<COMMA>chardev=stdio0$<COMMA>arg=program-name \
669+
-monitor none -serial none -nographic -device loader$<COMMA>file=@BINARY@$<COMMA>cpu-num=0")
670+
endif()
664671
set(lib_compile_flags "${lib_compile_flags} -Wno-error=atomic-alignment")
665672

666673
set(common_llvmlibc_cmake_args

0 commit comments

Comments
 (0)