WIP use stock qemu

immunant · Nov 12, 2024 · e6edc4c · e6edc4c
1 parent 43fdbab
commit e6edc4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,6 +85,7 @@ jobs:
             libclang-15-dev
             zlib1g-dev
             libcapstone-dev
+            qemu-user-static
           version: 1.0 # version of cache to load
       - name: Check out code
         uses: actions/checkout@v4
@@ -181,7 +182,7 @@ jobs:
           -I${rtlibs_dir}/include/c++/v1"
           export LDFLAGS="-L/usr/aarch64-linux-gnu/lib"
           cmake .. \
-            -DCMAKE_CROSSCOMPILING_EMULATOR=${{ github.workspace }}/qemu/build/qemu-aarch64 \
+            -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-aarch64-static \
             -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64-toolchain.cmake \
             -DCMAKE_C_COMPILER=`pwd`/../llvm-project/build/bin/clang-19 \
             -DCMAKE_CXX_COMPILER=`pwd`/../llvm-project/build/bin/clang-19 \

diff --git a/cmake/define-test.cmake b/cmake/define-test.cmake
@@ -143,12 +143,11 @@ function(define_test)
                 # unless natively AArch64, default to running tests with qemu-aarch64 and a custom LD_LIBRARY_PATH
                 if (NOT ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL aarch64)
                     if (NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
-                        set(CMAKE_CROSSCOMPILING_EMULATOR qemu-aarch64 -E LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib:/usr/aarch64-linux-gnu/lib64)
+                        set(CMAKE_CROSSCOMPILING_EMULATOR qemu-aarch64-static -E LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib:/usr/aarch64-linux-gnu/lib64)
                     endif()
                 endif()
                 add_test(NAME ${TEST_NAME}
                     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}
-                        "-one-insn-per-tb"
                         "-L" "${CMAKE_BINARY_DIR}/external/glibc/sysroot/usr/"
                         "-E" "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/external/glibc/sysroot/usr/lib:/usr/aarch64-linux-gnu/lib:/usr/aarch64-linux-gnu/lib64"
                         ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}