From b8494591d1b1a143f3b192d845c238bbf3bc629d Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 02:29:14 +0000 Subject: Revert "Revert "external/boringssl: sync with upstream."" This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88 --- linux-arm/crypto/sha/sha1-armv4-large.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linux-arm/crypto/sha/sha1-armv4-large.S') diff --git a/linux-arm/crypto/sha/sha1-armv4-large.S b/linux-arm/crypto/sha/sha1-armv4-large.S index 52c99bf..66d0ef3 100644 --- a/linux-arm/crypto/sha/sha1-armv4-large.S +++ b/linux-arm/crypto/sha/sha1-armv4-large.S @@ -1,4 +1,5 @@ -#include "arm_arch.h" +#if defined(__arm__) +#include .text .code 32 @@ -1458,3 +1459,4 @@ sha1_block_data_order_armv8: .comm OPENSSL_armcap_P,4,4 .hidden OPENSSL_armcap_P #endif +#endif \ No newline at end of file -- cgit v1.1