[2/2] arm: Produce .const_data instead of .section .rodata for Mach-O

Message ID 20180330094033.85137-2-martin@martin.st
State Committed
Commit 3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a
Headers show
Series
  • Untitled series #75
Related show

Commit Message

Martin Storsjö March 30, 2018, 9:40 a.m.
This is the same combination of .section directives as used in
aarch64/asm.S.

Since Xcode 9.3, the bundled clang supports altmacro and doesn't
require using gas-preprocessor any longer.
---
 libavutil/arm/asm.S | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Luca Barbato March 30, 2018, 11:11 a.m. | #1
On 30/03/2018 11:40, Martin Storsjö wrote:
> This is the same combination of .section directives as used in
> aarch64/asm.S.
> 
> Since Xcode 9.3, the bundled clang supports altmacro and doesn't
> require using gas-preprocessor any longer.
> ---
>   libavutil/arm/asm.S | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)

Ok.

Patch

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 08574852b5..e7eea0271f 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -111,11 +111,17 @@  FUNC    .func   \name
 ELF     .size   \name, . - \name
         .purgem endconst
     .endm
-.if HAVE_SECTION_DATA_REL_RO && \relocate
+#if HAVE_SECTION_DATA_REL_RO
+.if \relocate
         .section        .data.rel.ro
 .else
         .section        .rodata
 .endif
+#elif !defined(__MACH__)
+        .section        .rodata
+#else
+        .const_data
+#endif
         .align          \align
 \name:
 .endm