diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:46:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 02:46:08 +0000 |
| commit | 217603a4384148cd37c60a42f945449641617d27 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /linux-arm/crypto/bn/armv4-mont.S | |
| parent | e246de8f184e644debf965ecdca552f006b56881 (diff) | |
| parent | d947d006e7a7ebcfdfe642e686250caf2028c2c1 (diff) | |
| download | external_boringssl-217603a4384148cd37c60a42f945449641617d27.zip external_boringssl-217603a4384148cd37c60a42f945449641617d27.tar.gz external_boringssl-217603a4384148cd37c60a42f945449641617d27.tar.bz2 | |
am d947d006: am b8494591: Revert "Revert "external/boringssl: sync with upstream.""
* commit 'd947d006e7a7ebcfdfe642e686250caf2028c2c1':
Revert "Revert "external/boringssl: sync with upstream.""
Diffstat (limited to 'linux-arm/crypto/bn/armv4-mont.S')
| -rw-r--r-- | linux-arm/crypto/bn/armv4-mont.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-arm/crypto/bn/armv4-mont.S b/linux-arm/crypto/bn/armv4-mont.S index 81dcbeb..fc671e8 100644 --- a/linux-arm/crypto/bn/armv4-mont.S +++ b/linux-arm/crypto/bn/armv4-mont.S @@ -1,4 +1,5 @@ -#include "arm_arch.h" +#if defined(__arm__) +#include <openssl/arm_arch.h> .text .code 32 @@ -585,3 +586,4 @@ bn_mul8x_mont_neon: .comm OPENSSL_armcap_P,4,4 .hidden OPENSSL_armcap_P #endif +#endif
\ No newline at end of file |