Mark asm as armv6 to avoid setting off armv7 contamination checker.

Gbp-Pq: Name armv6.patch

diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S
index 4c17124f816a8d0ce34127c84a97118966946f02..c0d75fbaee3969fa865f93edc4801ad08c6ae204 100644 (file)
--- a/linux-arm/crypto/chacha/chacha-armv4.S
+++ b/linux-arm/crypto/chacha/chacha-armv4.S
@@ -16,7 +16,7 @@
 
 @ 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
+.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
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  ChaCha20_neon,%function

diff --git a/linux-arm/crypto/fipsmodule/aes-armv4.S b/linux-arm/crypto/fipsmodule/aes-armv4.S
index 0a016949a00dfad752536df7d6cfbf43fdde2fc1..f1822b3e5f8e1160fd1383aa5051083d10db0464 100644 (file)
--- a/linux-arm/crypto/fipsmodule/aes-armv4.S
+++ b/linux-arm/crypto/fipsmodule/aes-armv4.S
@@ -61,7 +61,7 @@
 @ 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
+.arch  armv6
 
 .text
 #if defined(__thumb2__) && !defined(__APPLE__)

diff --git a/linux-arm/crypto/fipsmodule/aesv8-armx32.S b/linux-arm/crypto/fipsmodule/aesv8-armx32.S
index 42625fe58ff46c738ceefd47cab298bdbfc3fc33..483514b4d4f70f122d75a61193b2617fb4df309e 100644 (file)
--- a/linux-arm/crypto/fipsmodule/aesv8-armx32.S
+++ b/linux-arm/crypto/fipsmodule/aesv8-armx32.S
@@ -16,7 +16,7 @@
 
 #if __ARM_MAX_ARCH__>=7
 .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__

diff --git a/linux-arm/crypto/fipsmodule/armv4-mont.S b/linux-arm/crypto/fipsmodule/armv4-mont.S
index 702830a626936837e33d31a1a6574803e9a73ad6..63b609ebef198e6f8182de3f6e602034f54f7d15 100644 (file)
--- a/linux-arm/crypto/fipsmodule/armv4-mont.S
+++ b/linux-arm/crypto/fipsmodule/armv4-mont.S
@@ -16,7 +16,7 @@
 
 @ 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
+.arch  armv6
 
 .text
 #if defined(__thumb2__)
@@ -210,7 +210,7 @@ bn_mul_mont:
 #endif
 .size  bn_mul_mont,.-bn_mul_mont
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  bn_mul8x_mont_neon,%function

diff --git a/linux-arm/crypto/fipsmodule/bsaes-armv7.S b/linux-arm/crypto/fipsmodule/bsaes-armv7.S
index 0ad56bc78cba227aa9b37d1f904340a3be55f10b..33736c97a2db3e4658abfd4056d11c1726c67b61 100644 (file)
--- a/linux-arm/crypto/fipsmodule/bsaes-armv7.S
+++ b/linux-arm/crypto/fipsmodule/bsaes-armv7.S
@@ -84,7 +84,7 @@
 #endif
 
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .text

diff --git a/linux-arm/crypto/fipsmodule/ghash-armv4.S b/linux-arm/crypto/fipsmodule/ghash-armv4.S
index 16a52831b2ea44f74c416aab4dbbb9b3a4ae89d1..7cf70fec50e95962b3665eafb8041619b4f45877 100644 (file)
--- a/linux-arm/crypto/fipsmodule/ghash-armv4.S
+++ b/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
 @ 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
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .globl gcm_init_neon

diff --git a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
index 3e44698afe05f5883860af0c3697cdd7b121f5fe..718460a47fed34a413592cf0602e173b8e486601 100644 (file)
--- a/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
+++ b/linux-arm/crypto/fipsmodule/sha1-armv4-large.S
@@ -506,7 +506,7 @@ sha1_block_data_order:
 .align 2
 .align 5
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  sha1_block_data_order_neon,%function

diff --git a/linux-arm/crypto/fipsmodule/sha256-armv4.S b/linux-arm/crypto/fipsmodule/sha256-armv4.S
index 4f5739a71647a7cb7531219962886319957b0e4a..74741694a86b964a0e9a5019d7b5238c312093d2 100644 (file)
--- a/linux-arm/crypto/fipsmodule/sha256-armv4.S
+++ b/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
 @ 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
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .globl sha256_block_data_order_neon

diff --git a/linux-arm/crypto/fipsmodule/sha512-armv4.S b/linux-arm/crypto/fipsmodule/sha512-armv4.S
index 3d1d7815b84b16996542892e3a8231a158d49c19..6d56c4754956a86d756f43994d948329aacbe709 100644 (file)
--- a/linux-arm/crypto/fipsmodule/sha512-armv4.S
+++ b/linux-arm/crypto/fipsmodule/sha512-armv4.S
@@ -79,7 +79,7 @@
 
 @ 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
+.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
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .globl sha512_block_data_order_neon

diff --git a/linux-arm/crypto/test/trampoline-armv4.S b/linux-arm/crypto/test/trampoline-armv4.S
index 83e8aeebd5fd9de3c2a86f399964c812391e2ae1..fd2bf94dac571451cd64d414a91e86c823dffea1 100644 (file)
--- a/linux-arm/crypto/test/trampoline-armv4.S
+++ b/linux-arm/crypto/test/trampoline-armv4.S
@@ -14,7 +14,7 @@
 #endif
 .syntax        unified
 
-.arch  armv7-a
+.arch  armv6
 .fpu   vfp
 
 .text

diff --git a/src/crypto/chacha/asm/chacha-armv4.pl b/src/crypto/chacha/asm/chacha-armv4.pl
index 2a9a7d7b0e3eb1afe3ab5e78f7cd7209b9c44433..1c905c9632c900607241339d0266487e7fa2e46a 100755 (executable)
--- a/src/crypto/chacha/asm/chacha-armv4.pl
+++ b/src/crypto/chacha/asm/chacha-armv4.pl
@@ -173,7 +173,7 @@ $code.=<<___;
 
 @ 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
+.arch  armv6
 
 .text
 #if defined(__thumb2__) || defined(__clang__)
@@ -665,7 +665,7 @@ my ($a,$b,$c,$d,$t)=@_;
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  ChaCha20_neon,%function

diff --git a/src/crypto/fipsmodule/aes/asm/aes-armv4.pl b/src/crypto/fipsmodule/aes/asm/aes-armv4.pl
index f4ae922b7cfd79f66b31fe818f17675a04647519..586812f04d57d71be5675d83760a0b6f4bd32c4d 100644 (file)
--- a/src/crypto/fipsmodule/aes/asm/aes-armv4.pl
+++ b/src/crypto/fipsmodule/aes/asm/aes-armv4.pl
@@ -79,7 +79,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 AES
 @ instructions are in aesv8-armx.pl.)
-.arch  armv7-a
+.arch  armv6
 
 .text
 #if defined(__thumb2__) && !defined(__APPLE__)

diff --git a/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl b/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
index 13f86a0b69435265823d7a6795fa8bd134687f06..43237f22619d89540a93d7af685cd9b5b913e720 100644 (file)
--- a/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
+++ b/src/crypto/fipsmodule/aes/asm/aesv8-armx.pl
@@ -60,7 +60,7 @@ $code=<<___;
 ___
 $code.=".arch  armv8-a+crypto\n"                       if ($flavour =~ /64/);
 $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__

diff --git a/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl b/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
index d4db3b4d10693ce61b884e7bd9fae7a18795e8db..873579338dd4f914547f1e68e9cbf539a858ce26 100644 (file)
--- a/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
+++ b/src/crypto/fipsmodule/aes/asm/bsaes-armv7.pl
@@ -725,7 +725,7 @@ $code.=<<___;
 #endif
 
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .text

diff --git a/src/crypto/fipsmodule/aes/internal.h b/src/crypto/fipsmodule/aes/internal.h
index 0cebb04cae34da881f726065f811957b9b42af0f..32578c8fd7447bc59823fb444791adc04e6b2fa7 100644 (file)
--- a/src/crypto/fipsmodule/aes/internal.h
+++ b/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;
 }
 
-#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
+#elif false
 #define HWAES
 
 OPENSSL_INLINE int hwaes_capable(void) { return CRYPTO_is_ARMv8_AES_capable(); }

diff --git a/src/crypto/fipsmodule/bn/asm/armv4-mont.pl b/src/crypto/fipsmodule/bn/asm/armv4-mont.pl
index 2ee389e2a5d8aa3767b71ae3ec796e69f2d11c40..cedcf0938df17eb91b4b0515523d75a623aeda4c 100644 (file)
--- a/src/crypto/fipsmodule/bn/asm/armv4-mont.pl
+++ b/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
 @ 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,$bnptr)=map("r$_",(6..11));
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  bn_mul8x_mont_neon,%function

diff --git a/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl b/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl
index 778b5436c93a125fbeac5eca28125495c47b0c7f..9b6416a378f5a6c98e0c32427c27bf729009eb0c 100644 (file)
--- a/src/crypto/fipsmodule/modes/asm/ghash-armv4.pl
+++ b/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
 @ instructions are in aesv8-armx.pl.)
-.arch  armv7-a
+.arch  armv6
 
 .text
 #if defined(__thumb2__) || defined(__clang__)
@@ -429,7 +429,7 @@ ___
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .global        gcm_init_neon

diff --git a/src/crypto/fipsmodule/modes/internal.h b/src/crypto/fipsmodule/modes/internal.h
index dec1e56cc4e3fd2af042bb4836da9b9a3b41b6a0..c5c790848f718455084b018ad9e3872148f6b325 100644 (file)
--- a/src/crypto/fipsmodule/modes/internal.h
+++ b/src/crypto/fipsmodule/modes/internal.h
@@ -314,7 +314,7 @@ void gcm_ghash_4bit_mmx(uint64_t Xi[2], const u128 Htable[16], const uint8_t *in
                         size_t len);
 #endif  // OPENSSL_X86
 
-#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
+#elif false
 #define GHASH_ASM_ARM
 #define GCM_FUNCREF_4BIT
 

diff --git a/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl b/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
index 27187dd605fe7fa6143ed6401dbc5601e1698d4c..53afd581187e6e1e35a22b1dc74dcdd4f13674cd 100644 (file)
--- a/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
+++ b/src/crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
@@ -525,7 +525,7 @@ sub Xloop()
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .type  sha1_block_data_order_neon,%function

diff --git a/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl b/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl
index e5ecdfd169122419e470e41de8f61965001ddac0..43c8d767099eacaa18c790b54cdcee596436d8d9 100644 (file)
--- a/src/crypto/fipsmodule/sha/asm/sha256-armv4.pl
+++ b/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
 @ instructions are manually-encoded. (See unsha256.)
-.arch  armv7-a
+.arch  armv6
 
 .text
 #if defined(__thumb2__)
@@ -475,7 +475,7 @@ sub body_00_15 () {
 
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .global        sha256_block_data_order_neon

diff --git a/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl b/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl
index cc247a446327f4423ecc4e02539d059aa66fbf24..ceac69bbc57f3395eb274d6fb80cdd2bac6fcadd 100644 (file)
--- a/src/crypto/fipsmodule/sha/asm/sha512-armv4.pl
+++ b/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
 @ 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.=<<___;
 #if __ARM_MAX_ARCH__>=7
-.arch  armv7-a
+.arch  armv6
 .fpu   neon
 
 .global        sha512_block_data_order_neon

diff --git a/src/crypto/test/asm/trampoline-armv4.pl b/src/crypto/test/asm/trampoline-armv4.pl
index 30f510e75a526192f68bded9cb36bc6f5d1facdf..25d74227a6fad2d99b300022ac480efbbd951059 100755 (executable)
--- a/src/crypto/test/asm/trampoline-armv4.pl
+++ b/src/crypto/test/asm/trampoline-armv4.pl
@@ -49,7 +49,7 @@ my ($func, $state, $argv, $argc) = ("r0", "r1", "r2", "r3");
 my $code = <<____;
 .syntax        unified
 
-.arch  armv7-a
+.arch  armv6
 .fpu   vfp
 
 .text

diff --git a/src/include/openssl/arm_arch.h b/src/include/openssl/arm_arch.h
index faa2655e521703637ab1f166b66a0f4fdab7d269..d37e7bfcf144559e60db4e5105aa50705d8ac2c0 100644 (file)
--- a/src/include/openssl/arm_arch.h
+++ b/src/include/openssl/arm_arch.h
@@ -100,7 +100,7 @@
 
 // Even when building for 32-bit ARM, support for aarch64 crypto instructions
 // 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)