From 950a141a9da0d3acc633cdc03e4ca33a2644f5f3 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Sat, 26 Oct 2019 20:00:59 +0300 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20Android=E2=80=99s=20CPU=20features?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Android target uses CPU features such as +popcnt and +sse4.2 which are not available on Penryn. List the used CPU exactly the same way as it is listed in the Rust target. --- docker/Dockerfile.x86_64-linux-android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android index 21dbd03dd..919b7ae80 100644 --- a/docker/Dockerfile.x86_64-linux-android +++ b/docker/Dockerfile.x86_64-linux-android @@ -22,7 +22,7 @@ RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/ # Libz is distributed in the android ndk, but for some unknown reason it is not # found in the build process of some crates, so we explicit set the DEP_Z_ROOT ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \ - CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu Penryn" \ + CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="qemu-x86_64 -cpu qemu64,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt" \ CC_x86_64_linux_android=x86_64-linux-android-gcc \ CXX_x86_64_linux_android=x86_64-linux-android-g++ \ DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \ From b3beb5e534683eb077976c8fc342be5241db4db5 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Sun, 27 Oct 2019 15:06:56 +0200 Subject: [PATCH 2/2] Bump kernel versions for ppc64 and sparc64 --- docker/linux-image.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 4eaaffa22..f8e208b31 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -49,8 +49,8 @@ main() { powerpc64) # there is no stable port arch=ppc64 - # https://packages.debian.org/de/sid/linux-image-powerpc64 - kernel=5.2.0-3-powerpc64 + # https://packages.debian.org/en/sid/linux-image-powerpc64 + kernel=5.3.0-1-powerpc64 debsource="deb http://ftp.ports.debian.org/debian-ports unreleased main" debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports unstable main" # sid version of dropbear requires these dependencies @@ -66,8 +66,8 @@ main() { ;; sparc64) # there is no stable port - # https://packages.debian.org/de/sid/linux-image-sparc64 - kernel=5.2.0-3-sparc64 + # https://packages.debian.org/en/sid/linux-image-sparc64 + kernel=5.3.0-1-sparc64 debsource="deb http://ftp.ports.debian.org/debian-ports unreleased main" debsource="$debsource\ndeb http://ftp.ports.debian.org/debian-ports unstable main" # sid version of dropbear requires these dependencies