modes/asm/ghash-armv4.pl: address "infixes are deprecated" warnings.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6615)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index 9cc072e7c123281b58fe248b9ed7b718304f247f..9d8c98835ccd757fdd410620628029f166c1fbe7 100644 (file)
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -145,6 +145,8 @@ $code=<<___;
 .text
 #if defined(__thumb2__) || defined(__clang__)
 .syntax        unified
+#define ldrplb  ldrbpl
+#define ldrneb  ldrbne
 #endif
 #if defined(__thumb2__)
 .thumb
@@ -152,11 +154,6 @@ $code=<<___;
 .code  32
 #endif
 
-#ifdef  __clang__
-#define ldrplb  ldrbpl
-#define ldrneb  ldrbne
-#endif
-
 .type  rem_4bit,%object
 .align 5
 rem_4bit: