[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  ce5eb5e8149d8d03660575f4b8504c993851988a (commit)
      from  a091e212fc55244fe03a4c7db7d8978c5b5014cb (commit)


- Log -----------------------------------------------------------------
commit ce5eb5e8149d8d03660575f4b8504c993851988a
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Jun 29 17:48:54 2018 +0200

    modes/asm/ghash-armv4.pl: address "infixes are deprecated" warnings.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6615)

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/asm/ghash-armv4.pl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index 9cc072e..9d8c988 100644
--- 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: