From 7cd8d0278ac0fb4386952d134a289d476d755d2c Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 26 May 2019 02:14:03 -0400
Subject: [PATCH] Remove VFP_ABI_PUSH and VFP_ABI_POP macros

---
 sha512_armv4.S | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sha512_armv4.S b/sha512_armv4.S
index a1e8cd44..7a9e2ac2 100644
--- a/sha512_armv4.S
+++ b/sha512_armv4.S
@@ -79,9 +79,6 @@
 # define WORD64(hi0,lo0,hi1,lo1)	.word	hi0,lo0, hi1,lo1
 #endif
 
-#define VFP_ABI_PUSH   vstmdb  sp!,{d8-d15}
-#define VFP_ABI_POP    vldmia  sp!,{d8-d15}
-
 #if defined(__thumb2__)
 .syntax	unified
 .thumb
@@ -553,7 +550,7 @@ sha512_block_data_order_neon:
 	dmb	@ errata #451034 on early Cortex A8
 	add	r2,r1,r2,lsl#7	@ len to point at the end of inp
 	adr	r3,K512
-	VFP_ABI_PUSH
+	vstmdb  sp!,{d8-d15}
 	vldmia	r0,{d16,d17,d18,d19,d20,d21,d22,d23}		@ load context
 .Loop_neon:
 	vshr.u64	d24,d20,#14	@ 0
@@ -1867,7 +1864,7 @@ sha512_block_data_order_neon:
 	teq	r1,r2
 	sub	r3,#640	@ rewind K512
 	bne	.Loop_neon
-	VFP_ABI_POP
+	vldmia  sp!,{d8-d15}
 	bx	lr				@ .word	0xe12fff1e
 .size	sha512_block_data_order_neon,.-sha512_block_data_order_neon
 #endif