summaryrefslogtreecommitdiffstats
path: root/crypto/modes
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2017-02-13 18:16:16 +0100
committerAndy Polyakov <appro@openssl.org>2017-02-15 23:16:01 +0100
commitc93f06c12f10c07cea935abd78a07a037e27f155 (patch)
tree3d2235730878d090603412fa04f1cd56572c2715 /crypto/modes
parent59088e43b13da40beb09728bc142964e482b5a8f (diff)
ARMv4 assembly pack: harmonize Thumb-ification of iOS build.
Three modules were left behind in a285992763f3961f69a8d86bf7dfff020a08cef9. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2617)
Diffstat (limited to 'crypto/modes')
-rw-r--r--crypto/modes/asm/ghashv8-armx.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl
index cb4537b221..dcd5f595d2 100644
--- a/crypto/modes/asm/ghashv8-armx.pl
+++ b/crypto/modes/asm/ghashv8-armx.pl
@@ -67,7 +67,11 @@ $code=<<___;
.text
___
$code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/);
-$code.=".fpu neon\n.code 32\n" if ($flavour !~ /64/);
+$code.=<<___ if ($flavour !~ /64/);
+.fpu neon
+.code 32
+#undef __thumb2__
+___
################################################################################
# void gcm_init_v8(u128 Htable[16],const u64 H[2]);