avcodec/mpegvideo: fix edge emulation with uvlinesize below 25

[ffmpeg] / libavutil / aarch64 / asm.S

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 51850ec7ba63a0de62df8e644cd1413fda6d056d..d153df69d87673c74ff7e71febfad235f744cdb1 100644 (file)
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -23,13 +23,19 @@
 #ifdef __ELF__
 #   define ELF
 #else
-#   define ELF //
+#   define ELF  #
+#endif
+
+#if HAVE_AS_FUNC
+#   define FUNC
+#else
+#   define FUNC #
 #endif
 
 .macro  function name, export=0, align=2
     .macro endfunc
 ELF     .size   \name, . - \name
-        .endfunc
+FUNC    .endfunc
         .purgem endfunc
     .endm
         .text
@@ -37,11 +43,11 @@ ELF     .size   \name, . - \name
     .if \export
         .global EXTERN_ASM\name
 ELF     .type   EXTERN_ASM\name, %function
-        .func   EXTERN_ASM\name
+FUNC    .func   EXTERN_ASM\name
 EXTERN_ASM\name:
     .else
 ELF     .type   \name, %function
-        .func   \name
+FUNC    .func   \name
 \name:
     .endif
 .endm
@@ -57,9 +63,12 @@ ELF     .size   \name, . - \name
 .endm
 
 .macro  movrel rd, val
-#if CONFIG_PIC
-        adrp            \rd, #:pg_hi21:\val
-        add             \rd, \rd, #:lo12:\val
+#if CONFIG_PIC && defined(__APPLE__)
+        adrp            \rd, \val@PAGE
+        add             \rd, \rd, \val@PAGEOFF
+#elif CONFIG_PIC
+        adrp            \rd, \val
+        add             \rd, \rd, :lo12:\val
 #else
         ldr             \rd, =\val
 #endif