From a05ff6d34d2de9471a4dd5deb311ef4002420640 Mon Sep 17 00:00:00 2001
From: kettenis <>
Date: Wed, 24 Jan 2018 23:03:37 +0000
Subject: Make the NEON codepaths conditional on __STRICT_ALIGNMENT not being
 defined as they rely on unaligned access.

ok joel@
---
 src/lib/libcrypto/modes/asm/ghash-armv4.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/modes/asm')

diff --git a/src/lib/libcrypto/modes/asm/ghash-armv4.pl b/src/lib/libcrypto/modes/asm/ghash-armv4.pl
index 4f8372d897..2d57806b46 100644
--- a/src/lib/libcrypto/modes/asm/ghash-armv4.pl
+++ b/src/lib/libcrypto/modes/asm/ghash-armv4.pl
@@ -319,7 +319,7 @@ sub Dhi()   { shift=~m|q([1]?[0-9])|?"d".($1*2+1):"";   }
 sub Q()     { shift=~m|d([1-3]?[02468])|?"q".($1/2):""; }
 
 $code.=<<___;
-#if __ARM_ARCH__>=7
+#if __ARM_ARCH__>=7 && !defined(__STRICT_ALIGNMENT)
 .fpu	neon
 
 .global	gcm_gmult_neon
-- 
cgit v1.2.3-55-g6feb