From 952eb5c83fc7bde13ac1ea2692d114916e55a266 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Tue, 16 Jul 2019 21:38:17 +0530 Subject: [PATCH] travis a64: unicorn --- .travis/build-aarch64-linux/build.sh | 3 ++- .travis/build-aarch64-linux/deps.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis/build-aarch64-linux/build.sh b/.travis/build-aarch64-linux/build.sh index 396e806b..2d81b942 100755 --- a/.travis/build-aarch64-linux/build.sh +++ b/.travis/build-aarch64-linux/build.sh @@ -4,10 +4,11 @@ set -e set -x export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH +export UNICORNDIR=$(pwd)/dynarmic/externals/unicorn cd dynarmic mkdir build && cd build -cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-8 -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-8 -G Ninja +cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DDYNARMIC_TESTS_USE_UNICORN=1 -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-8 -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-8 -G Ninja ninja qemu-aarch64 -L /usr/aarch64-linux-gnu ./tests/dynarmic_tests -d yes diff --git a/.travis/build-aarch64-linux/deps.sh b/.travis/build-aarch64-linux/deps.sh index 9af4af81..5c56f29e 100755 --- a/.travis/build-aarch64-linux/deps.sh +++ b/.travis/build-aarch64-linux/deps.sh @@ -4,9 +4,13 @@ set -e set -x apt-get update -apt-get install -y git cmake gcc ninja-build g++-8-aarch64-linux-gnu qemu-user +apt-get install -y git cmake gcc python ninja-build g++-8-aarch64-linux-gnu qemu-user # TODO: This isn't ideal. cd dynarmic/externals git clone https://github.com/MerryMage/ext-boost -cd .. +git clone https://github.com/unicorn-engine/unicorn.git + +cd unicorn +UNICORN_ARCHS="arm aarch64" CC=aarch64-linux-gnu-gcc-8 ./make.sh +cd ../..