diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2019-01-03 18:18:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 18:18:27 +0300 |
| commit | a38849096faf142c931373cad5bf79c4373b6679 (patch) | |
| tree | 549917035c8e58b0935fdfc961c416b2230561c4 | |
| parent | 59b78d07a483450a5d2a1c06b83f04a1e64ba68a (diff) | |
| parent | 6c15d5eabac8adf77636ef9d6eab5d81cbf95657 (diff) | |
Merge pull request #15 from grendello/fix-android-ndk18
[ANDROID] Fix another Android toolchain issue with crypto assembly
| -rw-r--r-- | crypto/aes/asm/aesv8-armx.pl | 2 | ||||
| -rw-r--r-- | 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 ___ |