diff options
| author | James Almer <jamrial@gmail.com> | 2019-02-20 14:48:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-02-20 14:48:58 -0300 |
| commit | ebdc5c419aef0d9eed8c1ec57b30238194c1db0a (patch) | |
| tree | 4ccdbd6d38e4744fa9599982172155776c34a619 | |
| parent | cd8087444bb459c7c62e21913adfef5ec09675cc (diff) | |
| parent | 41cf3e3b1ca375962951fde1b90a03b16197d205 (diff) | |
| download | ffmpeg-ebdc5c419aef0d9eed8c1ec57b30238194c1db0a.tar.gz | |
Merge commit '41cf3e3b1ca375962951fde1b90a03b16197d205'
* commit '41cf3e3b1ca375962951fde1b90a03b16197d205':
arm: Create proper .rdata sections for COFF
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/aarch64/asm.S | 2 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index fd32bf784e..5c329430fd 100644 --- 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 diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 5fc85591dd..e3a8c7f065 100644 --- 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 |