diff options
author | Robert Sloan <varomodt@google.com> | 2017-12-18 11:26:17 -0800 |
---|---|---|
committer | Robert Sloan <varomodt@google.com> | 2017-12-18 11:26:23 -0800 |
commit | 558181089d69085101510906bd46e51ade9e20e9 (patch) | |
tree | e57121bbdd758b4b17aba72bf5d90559acfd0e4d /linux-arm | |
parent | cd79cdebdcdadadb156e037973c927abf3dac79d (diff) | |
download | boringssl-558181089d69085101510906bd46e51ade9e20e9.tar.gz |
external/boringssl: Sync to ea52ec98a56a40879b37493f3d1da1a1679e1fba.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/21baf6421a7e1e03f85cf2243c3c2404f5765072..ea52ec98a56a40879b37493f3d1da1a1679e1fba
Test: BoringSSL CTS Presubmits.
Change-Id: I6ebeb5f2aa7daa462c9d8933d9d5388011054fac
Diffstat (limited to 'linux-arm')
-rw-r--r-- | linux-arm/crypto/chacha/chacha-armv4.S | 4 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/aes-armv4.S | 5 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/armv4-mont.S | 4 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/ghash-armv4.S | 5 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/sha256-armv4.S | 5 | ||||
-rw-r--r-- | linux-arm/crypto/fipsmodule/sha512-armv4.S | 4 |
6 files changed, 27 insertions, 0 deletions
diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S index 6c947734..bb48d172 100644 --- a/linux-arm/crypto/chacha/chacha-armv4.S +++ b/linux-arm/crypto/chacha/chacha-armv4.S @@ -1,6 +1,10 @@ #if defined(__arm__) #include <openssl/arm_arch.h> +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. +.arch armv7-a + .text #if defined(__thumb2__) || defined(__clang__) .syntax unified diff --git a/linux-arm/crypto/fipsmodule/aes-armv4.S b/linux-arm/crypto/fipsmodule/aes-armv4.S index d401fc78..5e49e087 100644 --- a/linux-arm/crypto/fipsmodule/aes-armv4.S +++ b/linux-arm/crypto/fipsmodule/aes-armv4.S @@ -45,6 +45,11 @@ # define __ARM_ARCH__ __LINUX_ARM_ARCH__ #endif +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. (ARMv8 AES +@ instructions are in aesv8-armx.pl.) +.arch armv7-a + .text #if defined(__thumb2__) && !defined(__APPLE__) .syntax unified diff --git a/linux-arm/crypto/fipsmodule/armv4-mont.S b/linux-arm/crypto/fipsmodule/armv4-mont.S index e77a9ea6..1181a451 100644 --- a/linux-arm/crypto/fipsmodule/armv4-mont.S +++ b/linux-arm/crypto/fipsmodule/armv4-mont.S @@ -1,6 +1,10 @@ #if defined(__arm__) #include <openssl/arm_arch.h> +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. +.arch armv7-a + .text #if defined(__thumb2__) .syntax unified diff --git a/linux-arm/crypto/fipsmodule/ghash-armv4.S b/linux-arm/crypto/fipsmodule/ghash-armv4.S index 5f8b50d5..2ead9797 100644 --- a/linux-arm/crypto/fipsmodule/ghash-armv4.S +++ b/linux-arm/crypto/fipsmodule/ghash-armv4.S @@ -1,6 +1,11 @@ #if defined(__arm__) #include <openssl/arm_arch.h> +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. (ARMv8 PMULL +@ instructions are in aesv8-armx.pl.) +.arch armv7-a + .text #if defined(__thumb2__) || defined(__clang__) .syntax unified diff --git a/linux-arm/crypto/fipsmodule/sha256-armv4.S b/linux-arm/crypto/fipsmodule/sha256-armv4.S index f37fd7c7..3479a756 100644 --- a/linux-arm/crypto/fipsmodule/sha256-armv4.S +++ b/linux-arm/crypto/fipsmodule/sha256-armv4.S @@ -51,6 +51,11 @@ # define __ARM_MAX_ARCH__ 7 #endif +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors. It does have ARMv8-only code, but those +@ instructions are manually-encoded. (See unsha256.) +.arch armv7-a + .text #if defined(__thumb2__) .syntax unified diff --git a/linux-arm/crypto/fipsmodule/sha512-armv4.S b/linux-arm/crypto/fipsmodule/sha512-armv4.S index bbeddf92..f02c0ff3 100644 --- a/linux-arm/crypto/fipsmodule/sha512-armv4.S +++ b/linux-arm/crypto/fipsmodule/sha512-armv4.S @@ -64,6 +64,10 @@ # define VFP_ABI_POP #endif +@ Silence ARMv8 deprecated IT instruction warnings. This file is used by both +@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. +.arch armv7-a + #ifdef __ARMEL__ # define LO 0 # define HI 4 |