C9S/boringssl
2
0
Fork 0
mirror of https://boringssl.googlesource.com/boringssl synced 2026-07-21 14:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove now unnecessary <openssl/arm_arch.h> includes from assembly

Browse Source 
This header used to supply CPU capability constants and things like
__ARM_MAX_ARCH__. The latter is now part of asm_base.h, automatically
included by everything, and assembly files no longer do capability
checks.

The immediate motivation was that there were a few misspelled includes
that used "openssl/arm_arch.h" instead of <openssl/arm_arch.h> (see
https://boringssl-review.googlesource.com/c/boringssl/+/76247), but
given we can just remove them anyway, may as well clear this out.

This now also means we don't pollute another prefix in the global
namespace (though external callers shouldn't have been using this header
anyway).

I've kept the header around, but a no-op, because some bindings
libraries have explicitly listed the header and it's probably not worth
the trouble to clear those out.

Bug: 42290548
Change-Id: I24f36cd48b0e3b6498ecbdc70fecc36961a8b9fe
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/76248
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
This commit is contained in:
David Benjamin
2025-02-13 13:46:47 -05:00
committed by Boringssl LUCI CQ
parent 1a42cb8b27
commit 9bb8f779a7
87 changed files with 28 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/chacha/asm/chacha-armv4.pl
-2
View File
@@ -176,8 +176,6 @@ my @ret;
}
$code.=<<___;
#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
crypto/chacha/asm/chacha-armv8.pl
-2
View File
@@ -125,8 +125,6 @@ my ($a3,$b3,$c3,$d3)=map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
}
$code.=<<___;
#include <openssl/arm_arch.h>
.section .rodata
.align 5
crypto/cipher/asm/chacha20_poly1305_armv8.pl
-1
View File
@@ -309,7 +309,6 @@ ___
{
$code.=<<___;
#include <openssl/arm_arch.h>
.section .rodata
.align 7
crypto/cpu_aarch64_apple.cc
-2
View File
@@ -20,8 +20,6 @@
#include <sys/sysctl.h>
#include <sys/types.h>
#include <openssl/arm_arch.h>
static int has_hw_feature(const char *name) {
int value;
crypto/cpu_aarch64_fuchsia.cc
-2
View File
@@ -21,8 +21,6 @@
#include <zircon/syscalls.h>
#include <zircon/types.h>
#include <openssl/arm_arch.h>
void OPENSSL_cpuid_setup(void) {
uint32_t hwcap;
crypto/cpu_aarch64_linux.cc
-2
View File
@@ -19,8 +19,6 @@
#include <sys/auxv.h>
#include <openssl/arm_arch.h>
void OPENSSL_cpuid_setup(void) {
unsigned long hwcap = getauxval(AT_HWCAP);
crypto/cpu_aarch64_openbsd.cc
-2
View File
@@ -21,8 +21,6 @@
#include <machine/cpu.h>
#include <sys/sysctl.h>
#include <openssl/arm_arch.h>
#include "internal.h"
crypto/cpu_aarch64_sysreg.cc
-2
View File
@@ -21,8 +21,6 @@
(defined(ANDROID_BAREMETAL) || defined(OPENSSL_FREEBSD)) && \
!defined(OPENSSL_NO_ASM)
#include <openssl/arm_arch.h>
#define ID_AA64PFR0_EL1_ADVSIMD 5
#define ID_AA64ISAR0_EL1_AES 1
crypto/cpu_aarch64_win.cc
-2
View File
@@ -20,8 +20,6 @@
#include <windows.h>
#include <openssl/arm_arch.h>
void OPENSSL_cpuid_setup(void) {
// We do not need to check for the presence of NEON, as Armv8-A always has it
crypto/cpu_arm_freebsd.cc
-1
View File
@@ -19,7 +19,6 @@
#include <sys/auxv.h>
#include <sys/types.h>
#include <openssl/arm_arch.h>
#include <openssl/mem.h>
crypto/cpu_arm_linux.cc
-1
View File
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <unistd.h>
#include <openssl/arm_arch.h>
#include <openssl/mem.h>
#include "cpu_arm_linux.h"
crypto/crypto.cc
-2
View File
@@ -69,8 +69,6 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
#include <openssl/arm_arch.h>
#if defined(OPENSSL_STATIC_ARMCAP)
// See ARM ACLE for the definitions of these macros. Note |__ARM_FEATURE_AES|
crypto/fipsmodule/aes/asm/aesv8-armx.pl
-2
View File
@@ -58,8 +58,6 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
$prefix="aes_hw";
$code=<<___;
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
___
crypto/fipsmodule/aes/asm/aesv8-gcm-armv8.pl
-1
View File
@@ -195,7 +195,6 @@ open OUT,"| \"$^X\" $xlate $flavour $output";
*STDOUT=*OUT;
$code=<<___;
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__ >= 8
.arch armv8-a+crypto
crypto/fipsmodule/aes/asm/bsaes-armv7.pl
-2
View File
@@ -712,8 +712,6 @@ ___
$code.=<<___;
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
# define VFP_ABI_PUSH vstmdb sp!,{d8-d15}
# define VFP_ABI_POP vldmia sp!,{d8-d15}
# define VFP_ABI_FRAME 0x40
crypto/fipsmodule/aes/asm/ghash-armv4.pl
-2
View File
@@ -109,8 +109,6 @@ $inp="r2";
$len="r3";
$code=<<___;
#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.)
crypto/fipsmodule/aes/asm/ghash-neon-armv8.pl
-2
View File
@@ -162,8 +162,6 @@ ___
}
$code .= <<___;
#include <openssl/arm_arch.h>
.text
.global gcm_init_neon
crypto/fipsmodule/aes/asm/ghashv8-armx.pl
-2
View File
@@ -73,8 +73,6 @@ my ($Xl,$Xm,$Xh,$IN)=map("q$_",(0..3));
my ($t0,$t1,$t2,$xC2,$H,$Hhl,$H2)=map("q$_",(8..14));
$code=<<___;
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
___
crypto/fipsmodule/aes/asm/vpaes-armv8.pl
-2
View File
@@ -56,8 +56,6 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
*STDOUT=*OUT;
$code.=<<___;
#include <openssl/arm_arch.h>
.section .rodata
.type _vpaes_consts,%object
crypto/fipsmodule/bn/asm/armv4-mont.pl
-2
View File
@@ -102,8 +102,6 @@ $_n0="$num,#14*4";
$_num="$num,#15*4"; $_bpend=$_num;
$code=<<___;
#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
crypto/fipsmodule/bn/asm/armv8-mont.pl
-2
View File
@@ -69,8 +69,6 @@ $n0="x4"; # const BN_ULONG *n0,
$num="x5"; # size_t num);
$code.=<<___;
#include <openssl/arm_arch.h>
.text
.globl bn_mul_mont
crypto/fipsmodule/bn/asm/bn-armv8.pl
-2
View File
@@ -32,8 +32,6 @@ open OUT, "| \"$^X\" \"$xlate\" $flavour \"$output\"";
my ($rp, $ap, $bp, $num) = ("x0", "x1", "x2", "x3");
my ($a0, $a1, $b0, $b1, $num_pairs) = ("x4", "x5", "x6", "x7", "x8");
my $code = <<____;
#include <openssl/arm_arch.h>
.text
// BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
crypto/fipsmodule/ec/asm/p256-armv8-asm.pl
-2
View File
@@ -59,8 +59,6 @@ my ($rp,$ap,$bp,$bi,$a0,$a1,$a2,$a3,$t0,$t1,$t2,$t3,$poly1,$poly3,
my ($acc6,$acc7)=($ap,$bp); # used in __ecp_nistz256_sqr_mont
$code.=<<___;
#include "openssl/arm_arch.h"
.section .rodata
.align 5
.Lpoly:
crypto/fipsmodule/ec/asm/p256_beeu-armv8-asm.pl
-2
View File
@@ -217,8 +217,6 @@ ___
}
$code.=<<___;
#include "openssl/arm_arch.h"
.text
.globl beeu_mod_inverse_vartime
.type beeu_mod_inverse_vartime, %function
crypto/fipsmodule/sha/asm/sha1-armv4-large.pl
-2
View File
@@ -192,8 +192,6 @@ ___
}
$code=<<___;
#include <openssl/arm_arch.h>
.text
#if defined(__thumb2__)
.syntax unified
crypto/fipsmodule/sha/asm/sha1-armv8.pl
-2
View File
@@ -176,8 +176,6 @@ ___
}
$code.=<<___;
#include <openssl/arm_arch.h>
.text
.globl sha1_block_data_order_nohw
crypto/fipsmodule/sha/asm/sha256-armv4.pl
+1 -3
View File
@@ -179,9 +179,7 @@ ___
}
$code=<<___;
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#else
#ifdef __KERNEL__
# define __ARM_ARCH __LINUX_ARM_ARCH__
# define __ARM_MAX_ARCH__ 7
#endif
crypto/fipsmodule/sha/asm/sha512-armv4.pl
-1
View File
@@ -203,7 +203,6 @@ ___
}
$code=<<___;
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
# define VFP_ABI_PUSH vstmdb sp!,{d8-d15}
# define VFP_ABI_POP vldmia sp!,{d8-d15}
#else
crypto/fipsmodule/sha/asm/sha512-armv8.pl
-4
View File
@@ -177,10 +177,6 @@ ___
}
$code.=<<___;
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl $func
crypto/internal.h
+20 -3
View File
@@ -15,7 +15,6 @@
#ifndef OPENSSL_HEADER_CRYPTO_INTERNAL_H
#define OPENSSL_HEADER_CRYPTO_INTERNAL_H
#include <openssl/arm_arch.h>
#include <openssl/crypto.h>
#include <openssl/ex_data.h>
#include <openssl/stack.h>
@@ -1290,8 +1289,26 @@ inline int CRYPTO_is_VPCLMULQDQ_capable(void) {
#if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
// OPENSSL_armcap_P contains ARM CPU capabilities. From C, this should only be
// accessed with |OPENSSL_get_armcap|.
// ARMV7_NEON indicates support for NEON.
#define ARMV7_NEON (1 << 0)
// ARMV8_AES indicates support for hardware AES instructions.
#define ARMV8_AES (1 << 2)
// ARMV8_SHA1 indicates support for hardware SHA-1 instructions.
#define ARMV8_SHA1 (1 << 3)
// ARMV8_SHA256 indicates support for hardware SHA-256 instructions.
#define ARMV8_SHA256 (1 << 4)
// ARMV8_PMULL indicates support for carryless multiplication.
#define ARMV8_PMULL (1 << 5)
// ARMV8_SHA512 indicates support for hardware SHA-512 instructions.
#define ARMV8_SHA512 (1 << 6)
// OPENSSL_armcap_P contains ARM CPU capabilities as a bitmask of the above
// constants. This should only be accessed with |OPENSSL_get_armcap|.
extern uint32_t OPENSSL_armcap_P;
// OPENSSL_get_armcap initializes the library if needed and returns ARM CPU
crypto/test/asm/trampoline-armv8.pl
-2
View File
@@ -45,8 +45,6 @@ open OUT, "| \"$^X\" \"$xlate\" $flavour \"$output\"";
my ($func, $state, $argv, $argc) = ("x0", "x1", "x2", "x3");
my $code = <<____;
#include <openssl/arm_arch.h>
.text
// abi_test_trampoline loads callee-saved registers from |state|, calls |func|
crypto/test/gtest_main.cc
+3 -8
View File
@@ -24,12 +24,6 @@
#include "gtest_main.h"
#include "../internal.h"
#if (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
!defined(OPENSSL_STATIC_ARMCAP)
#include <openssl/arm_arch.h>
#define TEST_ARM_CPUS
#endif
int main(int argc, char **argv) {
testing::InitGoogleMock(&argc, argv);
@@ -43,7 +37,8 @@ int main(int argc, char **argv) {
}
#endif
#if defined(TEST_ARM_CPUS)
#if (defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)) && \
!defined(OPENSSL_STATIC_ARMCAP)
if (strncmp(argv[i], "--cpu=", 6) == 0) {
const char *cpu = argv[i] + 6;
uint32_t armcap;
@@ -68,7 +63,7 @@ int main(int argc, char **argv) {
printf("Simulating CPU '%s'\n", cpu);
*armcap_ptr = armcap;
}
#endif // TEST_ARM_CPUS
#endif // (ARM || AARCH64) && !STATIC_ARMCAP
if (strcmp(argv[i], "--no_unwind_tests") == 0) {
unwind_tests = false;
gen/bcm/aesv8-armv7-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.arch armv7-a @ don't confuse not-so-latest binutils with argv8 :-)
gen/bcm/aesv8-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
gen/bcm/aesv8-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.arch armv8-a+crypto
gen/bcm/aesv8-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.arch armv8-a+crypto
gen/bcm/aesv8-gcm-armv8-apple.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__ >= 8
gen/bcm/aesv8-gcm-armv8-linux.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__ >= 8
.arch armv8-a+crypto
gen/bcm/aesv8-gcm-armv8-win.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__ >= 8
.arch armv8-a+crypto
gen/bcm/armv4-mont-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#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
gen/bcm/armv8-mont-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.text
.globl _bn_mul_mont
gen/bcm/armv8-mont-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
.globl bn_mul_mont
gen/bcm/armv8-mont-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.text
.globl bn_mul_mont
gen/bcm/bn-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.text
// BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
gen/bcm/bn-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
// BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
gen/bcm/bn-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.text
// BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
gen/bcm/bsaes-armv7-linux.S
-2
View File
@@ -61,8 +61,6 @@
@ Add CBC, CTR and XTS subroutines and adapt for kernel use; courtesy of Ard.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
# define VFP_ABI_PUSH vstmdb sp!,{d8-d15}
# define VFP_ABI_POP vldmia sp!,{d8-d15}
# define VFP_ABI_FRAME 0x40
gen/bcm/ghash-armv4-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#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.)
gen/bcm/ghash-neon-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.text
.globl _gcm_init_neon
gen/bcm/ghash-neon-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
.globl gcm_init_neon
gen/bcm/ghash-neon-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.text
.globl gcm_init_neon
gen/bcm/ghashv8-armv7-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.fpu neon
gen/bcm/ghashv8-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
gen/bcm/ghashv8-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.arch armv8-a+crypto
gen/bcm/ghashv8-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
#if __ARM_MAX_ARCH__>=7
.text
.arch armv8-a+crypto
gen/bcm/p256-armv8-asm-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include "openssl/arm_arch.h"
.section __TEXT,__const
.align 5
Lpoly:
gen/bcm/p256-armv8-asm-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include "openssl/arm_arch.h"
.section .rodata
.align 5
.Lpoly:
gen/bcm/p256-armv8-asm-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include "openssl/arm_arch.h"
.section .rodata
.align 5
Lpoly:
gen/bcm/p256_beeu-armv8-asm-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include "openssl/arm_arch.h"
.text
.globl _beeu_mod_inverse_vartime
.private_extern _beeu_mod_inverse_vartime
gen/bcm/p256_beeu-armv8-asm-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include "openssl/arm_arch.h"
.text
.globl beeu_mod_inverse_vartime
.hidden beeu_mod_inverse_vartime
gen/bcm/p256_beeu-armv8-asm-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include "openssl/arm_arch.h"
.text
.globl beeu_mod_inverse_vartime
gen/bcm/sha1-armv4-large-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
#if defined(__thumb2__)
.syntax unified
gen/bcm/sha1-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.text
.globl _sha1_block_data_order_nohw
gen/bcm/sha1-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
.globl sha1_block_data_order_nohw
gen/bcm/sha1-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.text
.globl sha1_block_data_order_nohw
gen/bcm/sha256-armv4-linux.S
+1 -3
View File
@@ -52,9 +52,7 @@
@
@ Add ARMv8 code path performing at 2.0 cpb on Apple A7.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#else
#ifdef __KERNEL__
# define __ARM_ARCH __LINUX_ARM_ARCH__
# define __ARM_MAX_ARCH__ 7
#endif
gen/bcm/sha256-armv8-apple.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl _sha256_block_data_order_nohw
gen/bcm/sha256-armv8-linux.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl sha256_block_data_order_nohw
gen/bcm/sha256-armv8-win.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl sha256_block_data_order_nohw
gen/bcm/sha512-armv4-linux.S
-1
View File
@@ -62,7 +62,6 @@
@ was reflected in below two parameters as 0 and 4. Now caller is
@ expected to maintain native byte order for whole 64-bit values.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
# define VFP_ABI_PUSH vstmdb sp!,{d8-d15}
# define VFP_ABI_POP vldmia sp!,{d8-d15}
#else
gen/bcm/sha512-armv8-apple.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl _sha512_block_data_order_nohw
gen/bcm/sha512-armv8-linux.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl sha512_block_data_order_nohw
gen/bcm/sha512-armv8-win.S
-4
View File
@@ -47,10 +47,6 @@
// generated with -mgeneral-regs-only is significantly faster
// and the gap is only 40-90%.
#ifndef __KERNEL__
# include <openssl/arm_arch.h>
#endif
.text
.globl sha512_block_data_order_nohw
gen/bcm/vpaes-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.section __TEXT,__const
gen/bcm/vpaes-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.section .rodata
.type _vpaes_consts,%object
gen/bcm/vpaes-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.section .rodata
gen/crypto/chacha-armv4-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_ARM) && defined(__ELF__)
#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
gen/crypto/chacha-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.section __TEXT,__const
.align 5
gen/crypto/chacha-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.section .rodata
.align 5
gen/crypto/chacha-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.section .rodata
.align 5
gen/crypto/chacha20_poly1305_armv8-apple.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.section __TEXT,__const
.align 7
gen/crypto/chacha20_poly1305_armv8-linux.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.section .rodata
.align 7
gen/crypto/chacha20_poly1305_armv8-win.S
-1
View File
@@ -4,7 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.section .rodata
.align 7
gen/test_support/trampoline-armv8-apple.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__APPLE__)
#include <openssl/arm_arch.h>
.text
// abi_test_trampoline loads callee-saved registers from |state|, calls |func|
gen/test_support/trampoline-armv8-linux.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(__ELF__)
#include <openssl/arm_arch.h>
.text
// abi_test_trampoline loads callee-saved registers from |state|, calls |func|
gen/test_support/trampoline-armv8-win.S
-2
View File
@@ -4,8 +4,6 @@
#include <openssl/asm_base.h>
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_AARCH64) && defined(_WIN32)
#include <openssl/arm_arch.h>
.text
// abi_test_trampoline loads callee-saved registers from |state|, calls |func|
include/openssl/arm_arch.h
+3 -25
View File
@@ -17,30 +17,8 @@
#include <openssl/target.h>
// arm_arch.h contains symbols used by ARM assembly, and the C code that calls
// it. It is included as a public header to simplify the build, but is not
// intended for external use.
#if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
// ARMV7_NEON is true when a NEON unit is present in the current CPU.
#define ARMV7_NEON (1 << 0)
// ARMV8_AES indicates support for hardware AES instructions.
#define ARMV8_AES (1 << 2)
// ARMV8_SHA1 indicates support for hardware SHA-1 instructions.
#define ARMV8_SHA1 (1 << 3)
// ARMV8_SHA256 indicates support for hardware SHA-256 instructions.
#define ARMV8_SHA256 (1 << 4)
// ARMV8_PMULL indicates support for carryless multiplication.
#define ARMV8_PMULL (1 << 5)
// ARMV8_SHA512 indicates support for hardware SHA-512 instructions.
#define ARMV8_SHA512 (1 << 6)
#endif // ARM || AARCH64
// This header historically defined constants used by Arm assembly, which was
// exposed publicly to simplify the build. This is no longer needed, but we
// retain the header for compatibility.
#endif // OPENSSL_HEADER_ARM_ARCH_H