Description: Mark asm as armv6 to avoid setting off armv7 contamination checker.
Author: Peter Michael Green <plugwash@raspbian.org>
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/chacha/chacha-armv4.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/chacha/chacha-armv4.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/chacha/chacha-armv4.S
-@@ -16,7 +16,7 @@
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -18,3 +18,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__) || defined(__clang__)
-@@ -808,7 +808,7 @@ ChaCha20_ctr32:
- ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc}
- .size ChaCha20_ctr32,.-ChaCha20_ctr32
+@@ -810,3 +810,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type ChaCha20_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/vpaes-armv7.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/vpaes-armv7.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/vpaes-armv7.S
-@@ -64,1 +64,1 @@
+@@ -64 +64 @@
-.arch armv7-a
+.arch armv6
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/aesv8-armx32.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/aesv8-armx32.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/aesv8-armx32.S
-@@ -16,7 +16,7 @@
-
- #if __ARM_MAX_ARCH__>=7
+@@ -18,3 +18,3 @@
.text
-.arch armv7-a @ don't confuse not-so-latest binutils with argv8 :-)
+.arch armv6 @ don't confuse not-so-latest binutils with argv8 :-)
.fpu neon
- .code 32
- #undef __thumb2__
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/armv4-mont.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/armv4-mont.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/armv4-mont.S
-@@ -16,7 +16,7 @@
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -18,3 +18,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__)
-@@ -210,7 +210,7 @@ bn_mul_mont:
- #endif
- .size bn_mul_mont,.-bn_mul_mont
+@@ -212,3 +212,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type bn_mul8x_mont_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/bsaes-armv7.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/bsaes-armv7.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/bsaes-armv7.S
-@@ -84,7 +84,7 @@
- #endif
-
+@@ -86,3 +86,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .text
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/ghash-armv4.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/ghash-armv4.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/ghash-armv4.S
-@@ -17,7 +17,7 @@
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
- @ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. (ARMv8 PMULL
+@@ -19,3 +19,3 @@
@ instructions are in aesv8-armx.pl.)
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__) || defined(__clang__)
-@@ -367,7 +367,7 @@ gcm_gmult_4bit:
- #endif
- .size gcm_gmult_4bit,.-gcm_gmult_4bit
+@@ -369,3 +369,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .globl gcm_init_neon
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
-@@ -506,7 +506,7 @@ sha1_block_data_order:
- .align 2
- .align 5
+@@ -508,3 +508,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type sha1_block_data_order_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha256-armv4.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/sha256-armv4.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha256-armv4.S
-@@ -67,7 +67,7 @@
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
- @ ARMv7 and ARMv8 processors. It does have ARMv8-only code, but those
+@@ -69,3 +69,3 @@
@ instructions are manually-encoded. (See unsha256.)
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__)
-@@ -1892,7 +1892,7 @@ sha256_block_data_order:
- #endif
- .size sha256_block_data_order,.-sha256_block_data_order
+@@ -1894,3 +1894,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .globl sha256_block_data_order_neon
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha512-armv4.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/fipsmodule/sha512-armv4.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/fipsmodule/sha512-armv4.S
-@@ -79,7 +79,7 @@
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -81,3 +81,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- #ifdef __ARMEL__
- # define LO 0
-@@ -550,7 +550,7 @@ sha512_block_data_order:
- #endif
- .size sha512_block_data_order,.-sha512_block_data_order
+@@ -552,3 +552,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .globl sha512_block_data_order_neon
-Index: android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/test/trampoline-armv4.S
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/linux-arm/crypto/test/trampoline-armv4.S
+++ android-platform-external-boringssl-10.0.0+r36/linux-arm/crypto/test/trampoline-armv4.S
-@@ -14,7 +14,7 @@
- #endif
- .syntax unified
+@@ -16,3 +16,3 @@
-.arch armv7-a
+.arch armv6
.fpu vfp
-
- .text
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/chacha/asm/chacha-armv4.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/chacha/asm/chacha-armv4.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/chacha/asm/chacha-armv4.pl
-@@ -173,7 +173,7 @@ $code.=<<___;
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -175,3 +175,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__) || defined(__clang__)
-@@ -665,7 +665,7 @@ my ($a,$b,$c,$d,$t)=@_;
-
- $code.=<<___;
+@@ -667,3 +667,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type ChaCha20_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/vpaes-armv7.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/aes/asm/vpaes-armv7.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/vpaes-armv7.pl
-@@ -82,1 +82,1 @@ $code=<<___;
+@@ -82 +82 @@
-.arch armv7-a
+.arch armv6
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
-@@ -60,7 +60,7 @@ $code=<<___;
- ___
- $code.=".arch armv8-a+crypto\n" if ($flavour =~ /64/);
+@@ -62,3 +62,3 @@
$code.=<<___ if ($flavour !~ /64/);
-.arch armv7-a // don't confuse not-so-latest binutils with argv8 :-)
+.arch armv6 // don't confuse not-so-latest binutils with argv8 :-)
.fpu neon
- .code 32
- #undef __thumb2__
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
-@@ -725,7 +725,7 @@ $code.=<<___;
- #endif
-
+@@ -727,3 +727,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .text
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/bn/asm/armv4-mont.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/bn/asm/armv4-mont.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/bn/asm/armv4-mont.pl
-@@ -99,7 +99,7 @@ $code=<<___;
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -101,3 +101,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__)
-@@ -306,7 +306,7 @@ my ($tinptr,$toutptr,$inner,$outer,$bnpt
-
- $code.=<<___;
+@@ -308,3 +308,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type bn_mul8x_mont_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl
-@@ -145,7 +145,7 @@ $code=<<___;
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
- @ ARMv7 and ARMv8 processors and does not use ARMv8 instructions. (ARMv8 PMULL
+@@ -147,3 +147,3 @@
@ instructions are in aesv8-armx.pl.)
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__) || defined(__clang__)
-@@ -429,7 +429,7 @@ ___
-
- $code.=<<___;
+@@ -431,3 +431,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .global gcm_init_neon
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
-@@ -525,7 +525,7 @@ sub Xloop()
-
- $code.=<<___;
+@@ -527,3 +527,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .type sha1_block_data_order_neon,%function
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl
-@@ -184,7 +184,7 @@ $code=<<___;
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
- @ ARMv7 and ARMv8 processors. It does have ARMv8-only code, but those
+@@ -186,3 +186,3 @@
@ instructions are manually-encoded. (See unsha256.)
-.arch armv7-a
+.arch armv6
- .text
- #if defined(__thumb2__)
-@@ -475,7 +475,7 @@ sub body_00_15 () {
-
- $code.=<<___;
+@@ -477,3 +477,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .global sha256_block_data_order_neon
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl
-@@ -210,7 +210,7 @@ $code=<<___;
-
- @ Silence ARMv8 deprecated IT instruction warnings. This file is used by both
+@@ -212,3 +212,3 @@
@ ARMv7 and ARMv8 processors and does not use ARMv8 instructions.
-.arch armv7-a
+.arch armv6
- #ifdef __ARMEL__
- # define LO 0
-@@ -606,7 +606,7 @@ ___
-
- $code.=<<___;
+@@ -608,3 +608,3 @@
#if __ARM_MAX_ARCH__>=7
-.arch armv7-a
+.arch armv6
.fpu neon
-
- .global sha512_block_data_order_neon
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/test/asm/trampoline-armv4.pl
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/test/asm/trampoline-armv4.pl
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/test/asm/trampoline-armv4.pl
-@@ -49,7 +49,7 @@ my ($func, $state, $argv, $argc) = ("r0"
- my $code = <<____;
- .syntax unified
+@@ -51,3 +51,3 @@
-.arch armv7-a
+.arch armv6
.fpu vfp
-
- .text
-Index: android-platform-external-boringssl-10.0.0+r36/src/include/openssl/arm_arch.h
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/include/openssl/arm_arch.h
+++ android-platform-external-boringssl-10.0.0+r36/src/include/openssl/arm_arch.h
-@@ -100,7 +100,7 @@
-
- // Even when building for 32-bit ARM, support for aarch64 crypto instructions
+@@ -102,3 +102,3 @@
// will be included.
-#define __ARM_MAX_ARCH__ 8
+#define __ARM_MAX_ARCH__ 6
- // ARMV7_NEON is true when a NEON unit is present in the current CPU.
- #define ARMV7_NEON (1 << 0)
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/internal.h
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/aes/internal.h
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/aes/internal.h
-@@ -42,7 +42,7 @@ OPENSSL_INLINE int vpaes_capable(void) {
- return (OPENSSL_ia32cap_get()[1] & (1 << (41 - 32))) != 0;
- }
+@@ -44,3 +44,3 @@
-#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
+#elif false
#define HWAES
-
- OPENSSL_INLINE int hwaes_capable(void) { return CRYPTO_is_ARMv8_AES_capable(); }
-Index: android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/modes/internal.h
-===================================================================
--- android-platform-external-boringssl-10.0.0+r36.orig/src/crypto/fipsmodule/modes/internal.h
+++ android-platform-external-boringssl-10.0.0+r36/src/crypto/fipsmodule/modes/internal.h
-@@ -314,7 +314,7 @@ void gcm_ghash_4bit_mmx(uint64_t Xi[2],
- size_t len);
- #endif // OPENSSL_X86
+@@ -316,3 +316,3 @@
-#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
+#elif false
#define GHASH_ASM_ARM
- #define GCM_FUNCREF_4BIT
-
projects / android-platform-external-boringssl.git / commitdiff