Skip to content

Commit 33bd2b9

Browse files
committed
Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'
* commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a': arm: Produce .const_data instead of .section .rodata for Mach-O Merged-by: James Almer <[email protected]>
2 parents a7109b8 + 3a7b4ae commit 33bd2b9

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

libavutil/arm/asm.S

+7-1
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,17 @@ FUNC .func \name
111111
ELF .size \name, . - \name
112112
.purgem endconst
113113
.endm
114-
.if HAVE_SECTION_DATA_REL_RO && \relocate
114+
#if HAVE_SECTION_DATA_REL_RO
115+
.if \relocate
115116
.section .data.rel.ro
116117
.else
117118
.section .rodata
118119
.endif
120+
#elif !defined(__MACH__)
121+
.section .rodata
122+
#else
123+
.const_data
124+
#endif
119125
.align \align
120126
\name:
121127
.endm

0 commit comments

Comments
 (0)