diff options
| author | Adam Langley <agl@google.com> | 2015-06-12 16:28:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-12 16:28:27 +0000 |
| commit | 9701a2fbe20a18d08253e84e8ec39d94db5376e0 (patch) | |
| tree | 26c038b10145f502cb98f5675516a7ed6bd27fdb /linux-arm/crypto/sha/sha256-armv4.S | |
| parent | 82ea518198c8ce74418c90597ccf8f444d1154ab (diff) | |
| parent | 53b272a2813a0b11f107d77100ff8805ada8fbd2 (diff) | |
| download | external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.zip external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.gz external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.bz2 | |
am 53b272a2: Bump revision of BoringSSL.
* commit '53b272a2813a0b11f107d77100ff8805ada8fbd2':
Bump revision of BoringSSL.
Diffstat (limited to 'linux-arm/crypto/sha/sha256-armv4.S')
| -rw-r--r-- | linux-arm/crypto/sha/sha256-armv4.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-arm/crypto/sha/sha256-armv4.S b/linux-arm/crypto/sha/sha256-armv4.S index ba37795..114aa43 100644 --- a/linux-arm/crypto/sha/sha256-armv4.S +++ b/linux-arm/crypto/sha/sha256-armv4.S @@ -1881,7 +1881,7 @@ sha256_block_data_order_neon: stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} sub r11,sp,#16*4+16 - adr r14,K256 + adrl r14,K256 bic r11,r11,#15 @ align for 128-bit stores mov r12,sp mov sp,r11 @ alloca |