diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2019-01-04 13:18:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 13:18:29 +0300 |
| commit | 3d87996698b28b3ab81dc3d410565733c4147b98 (patch) | |
| tree | 6bf93d94f58c27e83ee9c96d6da2de97277f0b17 | |
| parent | d637462848e93e1f23399af5d8ace0686373eabb (diff) | |
| parent | 6ca625c797c7beb121d4c5a22d7e97840c9ae027 (diff) | |
Merge pull request #17 from grendello/fix-android-ndk18
[Android] Fixing the previous clang fix
| -rw-r--r-- | crypto/aes/asm/aesv8-armx.pl | 10 | ||||
| -rw-r--r-- | crypto/modes/asm/ghashv8-armx.pl | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index 2e06ee33..89e6f874 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -51,8 +51,14 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if defined(ANDROID) || !defined(__clang__) -.arch armv8-a+crypto,+neon +#if !defined(__clang__) +.arch armv8-a+crypto +#elif defined(ANDROID) && defined(__clang__) +#if __clang_major__ > 3 +.arch armv8-a+crypto +#else +.arch armv8-a+crypto,+neon +#endif #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 abc2dd3f..73421405 100644 --- a/crypto/modes/asm/ghashv8-armx.pl +++ b/crypto/modes/asm/ghashv8-armx.pl @@ -59,8 +59,14 @@ $code=<<___; .text ___ $code.=<<___ if ($flavour =~ /64/); -#if defined(ANDROID) || !defined(__clang__) -.arch armv8-a+crypto,+neon +#if !defined(__clang__) +.arch armv8-a+crypto +#elif defined(ANDROID) && defined(__clang__) +#if __clang_major__ > 3 +.arch armv8-a+crypto +#else +.arch armv8-a+crypto,+neon +#endif #endif ___ $code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/); |