Merge pull request #17 from grendello/fix-android-ndk18

[Android] Fixing the previous clang fix
mono · Jan 4, 2019 · 3d87996 · 3d87996
2 parents d637462 + 6ca625c
commit 3d87996
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
@@ -51,8 +51,14 @@
 .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
@@ -59,8 +59,14 @@
 .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/);