Merge commit '41cf3e3b1ca375962951fde1b90a03b16197d205'

* commit '41cf3e3b1ca375962951fde1b90a03b16197d205': arm: Create proper .rdata sections for COFF Merged-by: James Almer <jamrial@gmail.com>
6 years ago · ebdc5c419a
parent cd8087444b 41cf3e3b1c
commit ebdc5c419a
2 changed files with 4 additions and 0 deletions
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@ -63,6 +63,8 @@ ELF     .size   \name, . - \name
 .else
        .section        .rodata
 .endif
+#elif defined(_WIN32)
+        .section        .rdata
 #elif !defined(__MACH__)
        .section        .rodata
 #else
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@ -125,6 +125,8 @@ ELF     .size   \name, . - \name
 .else
        .section        .rodata
 .endif
+#elif defined(_WIN32)
+        .section        .rdata
 #elif !defined(__MACH__)
        .section        .rodata
 #else