From d637462848e93e1f23399af5d8ace0686373eabb Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 3 Jan 2019 22:50:29 +0100 Subject: [PATCH] Another Android+clang assembly build fix (#16) This time for clang from an older NDK (14b) which not only needs the previous fix to enable the crypto extensions but it also needs NEON to be explicitly enabled in order to avoid errors similar to: ghashv8-armx.S:14:2: error: instruction requires: neon movi v19.16b,#0xe1 --- 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 2ef40ba2..2e06ee33 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -52,7 +52,7 @@ ___ $code.=<<___ if ($flavour =~ /64/); #if defined(ANDROID) || !defined(__clang__) -.arch armv8-a+crypto +.arch armv8-a+crypto,+neon #endif ___ $code.=".arch armv7-a\n.fpu neon\n.code 32\n" if ($flavour !~ /64/); diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl index 6cfe7d04..abc2dd3f 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -60,7 +60,7 @@ ___ $code.=<<___ if ($flavour =~ /64/); #if defined(ANDROID) || !defined(__clang__) -.arch armv8-a+crypto +.arch armv8-a+crypto,+neon #endif ___ $code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/);