Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / boringssl / src / crypto / modes / asm / ghash-armv4.pl

diff --git a/src/third_party/boringssl/src/crypto/modes/asm/ghash-armv4.pl b/src/third_party/boringssl/src/crypto/modes/asm/ghash-armv4.pl
index a8d6b2e..b324641 100644 (file)
--- a/src/third_party/boringssl/src/crypto/modes/asm/ghash-armv4.pl
+++ b/src/third_party/boringssl/src/crypto/modes/asm/ghash-armv4.pl
@@ -124,6 +124,8 @@ $code=<<___;
 #if defined(__arm__)
 #include "arm_arch.h"
 
+.syntax unified
+
 .text
 .code  32
 
@@ -198,7 +200,7 @@ gcm_ghash_4bit:
        eor     $Zlh,$Zlh,$Zhl,lsl#28
        ldrh    $Tll,[sp,$nlo]          @ rem_4bit[rem]
        eor     $Zhl,$Thl,$Zhl,lsr#4
-       ldrplb  $nlo,[$inp,$cnt]
+       ldrbpl  $nlo,[$inp,$cnt]
        eor     $Zhl,$Zhl,$Zhh,lsl#28
        eor     $Zhh,$Thh,$Zhh,lsr#4
 
@@ -208,7 +210,7 @@ gcm_ghash_4bit:
        add     $nhi,$nhi,$nhi
        ldmia   $Thh,{$Tll-$Thh}        @ load Htbl[nhi]
        eor     $Zll,$Tll,$Zll,lsr#4
-       ldrplb  $Tll,[$Xi,$cnt]
+       ldrbpl  $Tll,[$Xi,$cnt]
        eor     $Zll,$Zll,$Zlh,lsl#28
        eor     $Zlh,$Tlh,$Zlh,lsr#4
        ldrh    $Tlh,[sp,$nhi]
@@ -226,7 +228,7 @@ gcm_ghash_4bit:
        add     $inp,$inp,#16
        mov     $nhi,$Zll
 ___
-       &Zsmash("cmp\t$inp,$len","ldrneb\t$nlo,[$inp,#15]");
+       &Zsmash("cmp\t$inp,$len","ldrbne\t$nlo,[$inp,#15]");
 $code.=<<___;
        bne     .Louter
 
@@ -285,7 +287,7 @@ gcm_gmult_4bit:
        eor     $Zlh,$Zlh,$Zhl,lsl#28
        ldrh    $Tll,[$rem_4bit,$nlo]   @ rem_4bit[rem]
        eor     $Zhl,$Thl,$Zhl,lsr#4
-       ldrplb  $nlo,[$Xi,$cnt]
+       ldrbpl  $nlo,[$Xi,$cnt]
        eor     $Zhl,$Zhl,$Zhh,lsl#28
        eor     $Zhh,$Thh,$Zhh,lsr#4