From 6c15d5eabac8adf77636ef9d6eab5d81cbf95657 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 3 Jan 2019 08:58:02 +0100 Subject: [ANDROID] Fix another Android toolchain issue with crypto assembly Some armv8 assembly sources contain the following directive: #if !defined(__clang__) .arch armv8-a+crypto #endif Which supposedly works using desktop (probably Apple) versions of Clang but, for some reason, fails to build with Android NDK's clang - it appears the directive is necessary for that compiler to properly compile the assembly source. Make sure we do not exclude the directive when building for Android. --- crypto/aes/asm/aesv8-armx.pl | 2 +- crypto/modes/asm/ghashv8-armx.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index 121154a4..2ef40ba2 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -51,7 +51,7 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if !defined(__clang__) +#if defined(ANDROID) || !defined(__clang__) .arch armv8-a+crypto #endif ___ diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 3a7b8d8b..6cfe7d04 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -59,7 +59,7 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if !defined(__clang__) +#if defined(ANDROID) || !defined(__clang__) .arch armv8-a+crypto #endif ___ -- cgit v1.2.3