[vlc-devel] [PATCH] aarch64: Use the asm.S header and function macro

[Martin Storsjö]

This fixes building for other targets than ELF.
---
In practice, the SVE codepath doesn't get built when building with
clang yet, as it does support SVE in assembly but not in inline
assembly, and thus the configure check doesn't enable it yet. Tested
by manually building merge_sve.S for mingw/aarch64 with clang.
---
 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 9249ba3..f73c5e2 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]
-- 
2.7.4