From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 25 Sep 2015 00:26:37 +0000 Subject: Revert "external/boringssl: sync with upstream." This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3. This breaks some x86 builds. Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25 --- linux-arm/crypto/sha/sha1-armv4-large.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (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 66d0ef3..52c99bf 100644 --- a/linux-arm/crypto/sha/sha1-armv4-large.S +++ b/linux-arm/crypto/sha/sha1-armv4-large.S @@ -1,5 +1,4 @@ -#if defined(__arm__) -#include +#include "arm_arch.h" .text .code 32 @@ -1459,4 +1458,3 @@ 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