From 1ddba9c7807d6402b030dc8ce2cef8849c17d501 Mon Sep 17 00:00:00 2001 From: Gregory Lemercier Date: Thu, 4 Jan 2018 16:37:48 +0000 Subject: [PATCH] Fix build for ARM 64bit (aarch64) architecture --- configure.ac | 2 +- cpu-miner.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ae81b2e30..407362a80 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ case $target in x86_64-*-*|amd64-*-*) have_x86_64=true ;; - arm*-*-*) + arm*-*-*|aarch64-*-*) have_arm=true ;; esac diff --git a/cpu-miner.c b/cpu-miner.c index 1652a281f..a0e72c9af 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -1818,7 +1818,7 @@ static void signal_handler(int sig) { } #endif -#ifndef __arm__ +#if !(defined __arm__) && !(defined __aarch64__) static inline int cpuid(int code, uint32_t where[4]) { asm volatile("cpuid":"=a"(*where),"=b"(*(where+1)), "=c"(*(where+2)),"=d"(*(where+3)):"a"(code)); @@ -1828,7 +1828,7 @@ static inline int cpuid(int code, uint32_t where[4]) { static bool has_aes_ni() { - #ifdef __arm__ + #if (defined __arm__) || (defined __aarch64__) return false; #else uint32_t cpu_info[4];