Skip to content
This repository has been archived by the owner on Jun 10, 2021. It is now read-only.

[Android] Fixing the previous clang fix #17

Merged
merged 1 commit into from
Jan 4, 2019
Merged

[Android] Fixing the previous clang fix #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions crypto/aes/asm/aesv8-armx.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/);
Expand Down
10 changes: 8 additions & 2 deletions crypto/modes/asm/ghashv8-armx.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/);
Expand Down