From 091dcd954458869c6d2be981f7ab6144424350cb Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 5 Dec 2019 15:27:37 +0100
Subject: crypto: use new assembler macros for 5.5

---
 src/compat/compat-asm.h                          | 5 +++++
 src/crypto/zinc/blake2s/blake2s-x86_64.S         | 8 ++++----
 src/crypto/zinc/chacha20/chacha20-unrolled-arm.S | 8 ++++----
 src/crypto/zinc/chacha20/chacha20-x86_64.pl      | 4 ++--
 src/crypto/zinc/curve25519/curve25519-arm.S      | 4 ++--
 src/crypto/zinc/poly1305/poly1305-x86_64.pl      | 4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/compat/compat-asm.h b/src/compat/compat-asm.h
index f5c5bc2..bafd70b 100644
--- a/src/compat/compat-asm.h
+++ b/src/compat/compat-asm.h
@@ -40,4 +40,9 @@
 #undef pull
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+#define SYM_FUNC_START ENTRY
+#define SYM_FUNC_END ENDPROC
+#endif
+
 #endif /* _WG_COMPATASM_H */
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64.S b/src/crypto/zinc/blake2s/blake2s-x86_64.S
index 8591938..24910b7 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64.S
+++ b/src/crypto/zinc/blake2s/blake2s-x86_64.S
@@ -47,7 +47,7 @@ SIGMA2:
 
 .text
 #ifdef CONFIG_AS_SSSE3
-ENTRY(blake2s_compress_ssse3)
+SYM_FUNC_START(blake2s_compress_ssse3)
 	testq		%rdx,%rdx
 	je		.Lendofloop
 	movdqu		(%rdi),%xmm0
@@ -173,11 +173,11 @@ ENTRY(blake2s_compress_ssse3)
 	movdqu		%xmm14,0x20(%rdi)
 .Lendofloop:
 	ret
-ENDPROC(blake2s_compress_ssse3)
+SYM_FUNC_END(blake2s_compress_ssse3)
 #endif /* CONFIG_AS_SSSE3 */
 
 #ifdef CONFIG_AS_AVX512
-ENTRY(blake2s_compress_avx512)
+SYM_FUNC_START(blake2s_compress_avx512)
 	vmovdqu		(%rdi),%xmm0
 	vmovdqu		0x10(%rdi),%xmm1
 	vmovdqu		0x20(%rdi),%xmm4
@@ -254,5 +254,5 @@ ENTRY(blake2s_compress_avx512)
 	vmovdqu		%xmm4,0x20(%rdi)
 	vzeroupper
 	retq
-ENDPROC(blake2s_compress_avx512)
+SYM_FUNC_END(blake2s_compress_avx512)
 #endif /* CONFIG_AS_AVX512 */
diff --git a/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S b/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S
index 2140319..8fb4bc2 100644
--- a/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S
+++ b/src/crypto/zinc/chacha20/chacha20-unrolled-arm.S
@@ -394,7 +394,7 @@
  * void chacha20_arm(u8 *out, const u8 *in, size_t len, const u32 key[8],
  *		     const u32 iv[4]);
  */
-ENTRY(chacha20_arm)
+SYM_FUNC_START(chacha20_arm)
 	cmp		r2, #0			// len == 0?
 	reteq		lr
 
@@ -428,12 +428,12 @@ ENTRY(chacha20_arm)
 
 	add		sp, #76
 	pop		{r4-r11, pc}
-ENDPROC(chacha20_arm)
+SYM_FUNC_END(chacha20_arm)
 
 /*
  * void hchacha20_arm(const u32 state[16], u32 out[8]);
  */
-ENTRY(hchacha20_arm)
+SYM_FUNC_START(hchacha20_arm)
 	push		{r1,r4-r11,lr}
 
 	mov		r14, r0
@@ -458,4 +458,4 @@ ENTRY(hchacha20_arm)
 	stm		r4, {X0,X1,X2,X3,X12,X13,X14,X15}
 
 	pop		{r4-r11,pc}
-ENDPROC(hchacha20_arm)
+SYM_FUNC_END(hchacha20_arm)
diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.pl b/src/crypto/zinc/chacha20/chacha20-x86_64.pl
index cec7572..29906a6 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64.pl
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64.pl
@@ -124,7 +124,7 @@ sub declare_function() {
 	my ($name, $align, $nargs) = @_;
 	if($kernel) {
 		$code .= ".align $align\n";
-		$code .= "ENTRY($name)\n";
+		$code .= "SYM_FUNC_START($name)\n";
 		$code .= ".L$name:\n";
 	} else {
 		$code .= ".globl	$name\n";
@@ -137,7 +137,7 @@ sub declare_function() {
 sub end_function() {
 	my ($name) = @_;
 	if($kernel) {
-		$code .= "ENDPROC($name)\n";
+		$code .= "SYM_FUNC_END($name)\n";
 	} else {
 		$code .= ".size   $name,.-$name\n";
 	}
diff --git a/src/crypto/zinc/curve25519/curve25519-arm.S b/src/crypto/zinc/curve25519/curve25519-arm.S
index 0ef1431..8eca8a1 100644
--- a/src/crypto/zinc/curve25519/curve25519-arm.S
+++ b/src/crypto/zinc/curve25519/curve25519-arm.S
@@ -15,7 +15,7 @@
 .arch armv7-a
 .align 4
 
-ENTRY(curve25519_neon)
+SYM_FUNC_START(curve25519_neon)
 	push		{r4-r11, lr}
 	mov		ip, sp
 	sub		r3, sp, #704
@@ -2060,5 +2060,5 @@ ENTRY(curve25519_neon)
 	movw		r0, #0
 	mov		sp, ip
 	pop		{r4-r11, pc}
-ENDPROC(curve25519_neon)
+SYM_FUNC_END(curve25519_neon)
 #endif
diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64.pl b/src/crypto/zinc/poly1305/poly1305-x86_64.pl
index 37ed869..94c3c42 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64.pl
+++ b/src/crypto/zinc/poly1305/poly1305-x86_64.pl
@@ -109,7 +109,7 @@ sub declare_function() {
 	my ($name, $align, $nargs) = @_;
 	if($kernel) {
 		$code .= ".align $align\n";
-		$code .= "ENTRY($name)\n";
+		$code .= "SYM_FUNC_START($name)\n";
 		$code .= ".L$name:\n";
 	} else {
 		$code .= ".globl	$name\n";
@@ -122,7 +122,7 @@ sub declare_function() {
 sub end_function() {
 	my ($name) = @_;
 	if($kernel) {
-		$code .= "ENDPROC($name)\n";
+		$code .= "SYM_FUNC_END($name)\n";
 	} else {
 		$code .= ".size   $name,.-$name\n";
 	}
-- 
cgit v1.2.3-59-g8ed1b