From 6031485b6ac1cfd8d2fe566ec0053a3941e253c8 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 23 Mar 2022 15:13:31 +0000
Subject: Start disentangling armv7 and aarch64 code

arm_arch.h and armcap.c are shared between armv7 and aarch64 which
results in an inscrutable #ifdef maze. Move copies of these files
into arch/{arm,aarch64}/ with appropriate names and some trivial
minor adjustments.

ok deraadt inoguchi kettenis
---
 src/lib/libcrypto/arm64cpuid.S | 47 ------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 src/lib/libcrypto/arm64cpuid.S

(limited to 'src/lib/libcrypto/arm64cpuid.S')

diff --git a/src/lib/libcrypto/arm64cpuid.S b/src/lib/libcrypto/arm64cpuid.S
deleted file mode 100644
index 5eeff91c6e..0000000000
--- a/src/lib/libcrypto/arm64cpuid.S
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "arm_arch.h"
-
-.text
-.arch	armv8-a+crypto+sha3
-
-.align	5
-.globl	_armv7_neon_probe
-.type	_armv7_neon_probe,%function
-_armv7_neon_probe:
-	orr	v15.16b, v15.16b, v15.16b
-	ret
-.size	_armv7_neon_probe,.-_armv7_neon_probe
-
-.globl	_armv8_aes_probe
-.type	_armv8_aes_probe,%function
-_armv8_aes_probe:
-	aese	v0.16b, v0.16b
-	ret
-.size	_armv8_aes_probe,.-_armv8_aes_probe
-
-.globl	_armv8_sha1_probe
-.type	_armv8_sha1_probe,%function
-_armv8_sha1_probe:
-	sha1h	s0, s0
-	ret
-.size	_armv8_sha1_probe,.-_armv8_sha1_probe
-
-.globl	_armv8_sha256_probe
-.type	_armv8_sha256_probe,%function
-_armv8_sha256_probe:
-	sha256su0	v0.4s, v0.4s
-	ret
-.size	_armv8_sha256_probe,.-_armv8_sha256_probe
-
-.globl	_armv8_pmull_probe
-.type	_armv8_pmull_probe,%function
-_armv8_pmull_probe:
-	pmull	v0.1q, v0.1d, v0.1d
-	ret
-.size	_armv8_pmull_probe,.-_armv8_pmull_probe
-
-.globl	_armv8_sha512_probe
-.type	_armv8_sha512_probe,%function
-_armv8_sha512_probe:
-	sha512su0	v0.2d,v0.2d
-	ret
-.size	_armv8_sha512_probe,.-_armv8_sha512_probe
-- 
cgit v1.2.3-55-g6feb