From 94438f5f6b763bd4229d56b80e43cd86bc886864 Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Mon, 27 Jul 2020 20:50:25 +0000
Subject: [PATCH] Use <aarch64/asm.h> rather than copying things from it here.

Vestige from userland build on netbsd-9 during development.
---
 sys/crypto/chacha/arch/arm/chacha_neon_64.S | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/sys/crypto/chacha/arch/arm/chacha_neon_64.S b/sys/crypto/chacha/arch/arm/chacha_neon_64.S
index 6e8057661b70..2cc69c3ab010 100644
--- a/sys/crypto/chacha/arch/arm/chacha_neon_64.S
+++ b/sys/crypto/chacha/arch/arm/chacha_neon_64.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: chacha_neon_64.S,v 1.1 2020/07/25 22:51:57 riastradh Exp $	*/
+/*	$NetBSD: chacha_neon_64.S,v 1.2 2020/07/27 20:50:25 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -26,23 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-.macro	adrl 	reg, addr
-	adrp	\reg, \addr
-	add	\reg, \reg, #:lo12:\addr
-.endm
-
-#define	_ALIGN_TEXT							      \
-	.p2align 4
-
-#define	ENTRY(x)							      \
-	.text;								      \
-	_ALIGN_TEXT;							      \
-	.global	x;							      \
-	.type	x,@function;						      \
-x:
-
-#define	END(x)								      \
-	.size x, . - x
+#include <aarch64/asm.h>
 
 #define	ROUND(a0,b0,c0,d0,a1,b1,c1,d1,a2,b2,c2,d2,a3,b3,c3,d3,t0,t1,t2,t3, r) \
 STEP(STEP0,a0,b0,c0,d0,a1,b1,c1,d1,a2,b2,c2,d2,a3,b3,c3,d3,t0,t1,t2,t3, r);   \