From 05aba0e9440d7e92f7ab20b59cbffebc7356f6aa Mon Sep 17 00:00:00 2001 From: Will Hawkins <8715530+hawkinsw@users.noreply.github.com> Date: Wed, 7 Jun 2023 16:57:54 -0400 Subject: [PATCH] Add support for running aarch64 tests natively on aarch64 hardware (#278) Signed-off-by: Will Hawkins --- bpf/CMakeLists.txt | 2 +- ubpf_plugin/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bpf/CMakeLists.txt b/bpf/CMakeLists.txt index f8fde068..5cb9f454 100644 --- a/bpf/CMakeLists.txt +++ b/bpf/CMakeLists.txt @@ -10,7 +10,7 @@ execute_process( RESULT_VARIABLE CLANG_RETURN_CODE OUTPUT_STRIP_TRAILING_WHITESPACE ) -if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) +if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL aarch64)) set(PREFIX qemu-aarch64 -L /usr/aarch64-linux-gnu) else() set(PREFIX) diff --git a/ubpf_plugin/CMakeLists.txt b/ubpf_plugin/CMakeLists.txt index f7a854dc..7462a273 100644 --- a/ubpf_plugin/CMakeLists.txt +++ b/ubpf_plugin/CMakeLists.txt @@ -34,7 +34,7 @@ else() message(STATUS "Using custom bpf_conformance_runner: ${BPF_CONFORMANCE_RUNNER}") endif() -if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) +if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL aarch64)) set(PLUGIN_JIT --plugin_path ${CMAKE_BINARY_DIR}/bin/run-jit.sh) set(PLUGIN_INTERPRET --plugin_path ${CMAKE_BINARY_DIR}/bin/run-interpret.sh) else()