Skip to content

Commit 9cdd067

Browse files
committed
fixup! fixup! Use FVP models to test AArch64 Big Endian Variants.
I had changes in CMakeLists.txt to use the correct bootcode. This is no longer needed as it is already adding through a different patch: ARM-software#567
1 parent 25da7e9 commit 9cdd067

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,6 @@ function(
720720
default_ram_size
721721
default_stack_size
722722
run_tests
723-
executor
724723
)
725724
if(CMAKE_INSTALL_MESSAGE STREQUAL NEVER)
726725
set(MESON_INSTALL_QUIET "--quiet")
@@ -756,7 +755,6 @@ function(
756755
-Dtests-enable-stack-protector=false
757756
-Dtest-long-double=${enable_long_double_test}
758757
-Dnewlib-nano-malloc=${newlib_nano_malloc}
759-
-Dtest-machine=${executor}
760758
--prefix <INSTALL_DIR>
761759
--cross-file <BINARY_DIR>/meson-cross-build.txt
762760
--buildtype=${build_type}
@@ -1042,7 +1040,6 @@ macro(
10421040
default_ram_size
10431041
default_stack_size
10441042
run_tests
1045-
executor
10461043
)
10471044
# It would be nice to just pass ${ARGN} to both the underlying functions,
10481045
# but that has the side effect of expanding any list arguments (e.g.
@@ -1065,7 +1062,6 @@ macro(
10651062
"${default_ram_size}"
10661063
"${default_stack_size}"
10671064
"${run_tests}"
1068-
"${executor}"
10691065
)
10701066
elseif(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL newlib)
10711067
add_newlib(
@@ -1457,7 +1453,6 @@ function(add_library_variant target_arch)
14571453
set(have_executor FALSE)
14581454
endif()
14591455
else()
1460-
set(VARIANT_EXECUTOR "qemu")
14611456
get_qemu_params(
14621457
"${target_triple}"
14631458
"${VARIANT_QEMU_MACHINE}"
@@ -1488,7 +1483,6 @@ function(add_library_variant target_arch)
14881483
"${VARIANT_RAM_SIZE}"
14891484
"${VARIANT_STACK_SIZE}"
14901485
"${have_executor}"
1491-
"${VARIANT_EXECUTOR}"
14921486
)
14931487
add_compiler_rt(
14941488
"${directory}"

0 commit comments

Comments
 (0)