[x264-devel] [PATCH 1/2] arm: Fixup for "Set the function symbol prefix in a single location"

[Martin Storsjö]

---
 common/arm/asm.S     | 4 ++++
 tools/checkasm-arm.S | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index ea50643..1b9eaad 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -72,7 +72,11 @@ ELF     .eabi_attribute 25, \val
 
 .macro function name, export=1
     .macro endfunc
+.if \export
+ELF     .size   EXTERN_ASM\name, . - EXTERN_ASM\name
+.else
 ELF     .size   \name, . - \name
+.endif
 FUNC    .endfunc
         .purgem endfunc
     .endm
diff --git a/tools/checkasm-arm.S b/tools/checkasm-arm.S
index 433ac53..97e308d 100644
--- a/tools/checkasm-arm.S
+++ b/tools/checkasm-arm.S
@@ -52,7 +52,7 @@ error_message:
 
 .macro clobbercheck variant
 .equ pushed, 4*10
-function x264_checkasm_call_\variant
+function checkasm_call_\variant
     push        {r4-r11, lr}
 .ifc \variant, neon
     vpush       {q4-q7}
@@ -128,7 +128,11 @@ function x264_checkasm_call_\variant
     mov         r12, #0
     str         r12, [r2]
     movrel      r0, error_message
-    blx         X(puts)
+#ifdef PREFIX
+    blx         _puts
+#else
+    blx         puts
+#endif
 0:
     pop         {r0, r1}
 .ifc \variant, neon
-- 
2.7.4