Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'

[ffmpeg] / libavutil / aarch64 / asm.S

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 42897294280b1c98d093b73413e5c9a54d5f434d..fd32bf784e0954288ea56d0201d3c5aee04a4af3 100644 (file)
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -23,7 +23,7 @@
 #ifdef __ELF__
 #   define ELF
 #else
-#   define ELF  #
+#   define ELF #
 #endif
 
 #if HAVE_AS_FUNC
@@ -82,6 +82,15 @@ ELF     .size   \name, . - \name
         adrp            \rd, \val+(\offset)@PAGE
         add             \rd, \rd, \val+(\offset)@PAGEOFF
     .endif
+#elif CONFIG_PIC && defined(_WIN32)
+    .if \offset < 0
+        adrp            \rd, \val
+        add             \rd, \rd, :lo12:\val
+        sub             \rd, \rd, -(\offset)
+    .else
+        adrp            \rd, \val+(\offset)
+        add             \rd, \rd, :lo12:\val+(\offset)
+    .endif
 #elif CONFIG_PIC
         adrp            \rd, \val+(\offset)
         add             \rd, \rd, :lo12:\val+(\offset)