[vlc-commits] aarch64: Use the asm.S header and function macro for merge_sve.S

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Sat Dec 22 00:17:10 2018 +0200| [87233054482087df07550316de451ed54d9b1b66] | committer: Martin Storsjö

aarch64: Use the asm.S header and function macro for merge_sve.S

This fixes building the SVE code for other targets than ELF.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=87233054482087df07550316de451ed54d9b1b66
---

 modules/video_filter/deinterlace/merge_sve.S | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/video_filter/deinterlace/merge_sve.S b/modules/video_filter/deinterlace/merge_sve.S
index 9249ba343e..f73c5e2d6c 100644
--- a/modules/video_filter/deinterlace/merge_sve.S
+++ b/modules/video_filter/deinterlace/merge_sve.S
@@ -18,14 +18,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "../../arm_neon/asm.S"
+
 	.arch armv8-a+sve
 
 	/* TODO: prefetch, unroll */
 
 	.text
-	.globl	merge8_arm_sve
-	.type	merge8_arm_sve, %function
-merge8_arm_sve:
+function merge8_arm_sve
 	mov	x4, #0
 	b	2f
 1:	ld1b	{z0.h}, p0/z, [x1, x4]
@@ -38,9 +38,7 @@ merge8_arm_sve:
 	b.first	1b
 	ret
 
-	.globl	merge16_arm_sve
-	.type	merge16_arm_sve, %function
-merge16_arm_sve:
+function merge16_arm_sve
 	mov	x4, #0
 	b	2f
 1:	ld1h	{z0.s}, p0/z, [x1, x4, lsl #1]