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

[Martin Storsjö]

---
 common/aarch64/asm.S     | 4 ++++
 tools/checkasm-aarch64.S | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/aarch64/asm.S b/common/aarch64/asm.S
index bc3b79b..658a1dd 100644
--- a/common/aarch64/asm.S
+++ b/common/aarch64/asm.S
@@ -53,7 +53,11 @@
 
 .macro  function name, export=0, align=2
     .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-aarch64.S b/tools/checkasm-aarch64.S
index 0341a5a..5e023c6 100644
--- a/tools/checkasm-aarch64.S
+++ b/tools/checkasm-aarch64.S
@@ -58,7 +58,7 @@ error_message:
 
 #define CLOBBER_STACK ((8*MAX_ARGS + 15) & ~15)
 
-function x264_checkasm_stack_clobber, export=1
+function checkasm_stack_clobber, export=1
     mov         x3,  sp
     mov         x2,  #CLOBBER_STACK
 1:
@@ -71,7 +71,7 @@ endfunc
 
 #define ARG_STACK ((8*(MAX_ARGS - 8) + 15) & ~15)
 
-function x264_checkasm_call, export=1
+function checkasm_call, export=1
     stp         x29, x30, [sp, #-16]!
     mov         x29, sp
     stp         x19, x20, [sp, #-16]!
-- 
2.7.4