x86: Avoid using hardcoded function symbol prefixes

diff --git a/common/x86/cabac-a.asm b/common/x86/cabac-a.asm
index 27df8381152b332921ca8a43125dea040dc9684b..d7870a3abca3b64a5b2958997e1f92cd8f4c5529 100644 (file)
--- a/common/x86/cabac-a.asm
+++ b/common/x86/cabac-a.asm
@@ -42,11 +42,11 @@ coeff_abs_level_transition: db 1, 2, 3, 3, 4, 5, 6, 7
     %define funccpu3 %3
     %rep 14
         %ifidn %4, 4
-            dq mangle(x264_coeff_last%4_ %+ funccpu1)
+            dq mangle(private_prefix %+ _coeff_last%4_ %+ funccpu1)
         %elifidn %4, 64
-            dq mangle(x264_coeff_last%4_ %+ funccpu2)
+            dq mangle(private_prefix %+ _coeff_last%4_ %+ funccpu2)
         %else
-            dq mangle(x264_coeff_last%4_ %+ funccpu3)
+            dq mangle(private_prefix %+ _coeff_last%4_ %+ funccpu3)
         %endif
         %rotate 1
     %endrep
@@ -257,7 +257,7 @@ cabac_putbyte_%1:
 .postpone:
     inc   t5d
     mov   [t0+cb.bytes_outstanding], t5d
-    jmp mangle(x264_cabac_encode_decision_%1.update_queue_low)
+    jmp mangle(private_prefix %+ _cabac_encode_decision_%1.update_queue_low)
 %endmacro
 
 CABAC asm

diff --git a/common/x86/mc-a.asm b/common/x86/mc-a.asm
index 0f99e2f4a146680b9a9ef8aad02516bf187807c1..f16f9585c8698ac21de96cedef4b5b2e79322a78 100644 (file)
--- a/common/x86/mc-a.asm
+++ b/common/x86/mc-a.asm
@@ -1244,10 +1244,10 @@ cglobal pixel_avg2_w16_cache64_ssse3
     mov   eax, r2m
     and   eax, 0x3f
     cmp   eax, 0x30
-    jb x264_pixel_avg2_w16_sse2
+    jb pixel_avg2_w16_sse2
     or    eax, r4m
     and   eax, 7
-    jz x264_pixel_avg2_w16_sse2
+    jz pixel_avg2_w16_sse2
 %endif
     PROLOGUE 6, 8
     lea    r6, [r4+r2]

diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm
index 33095cfef22f48e54d9989c517fdd959de4352c1..0dfe61d6de470e299a241200e2d9c5583aae43a0 100644 (file)
--- a/common/x86/pixel-a.asm
+++ b/common/x86/pixel-a.asm
@@ -421,7 +421,7 @@ cglobal pixel_ssd_%1x%2, 0,0,0
     mov     al, %1*%2/mmsize/2
 
 %if %1 != %2
-    jmp mangle(x264_pixel_ssd_%1x%1 %+ SUFFIX %+ .startloop)
+    jmp mangle(private_prefix %+ _pixel_ssd_%1x%1 %+ SUFFIX %+ .startloop)
 %else
 
 .startloop:

diff --git a/common/x86/trellis-64.asm b/common/x86/trellis-64.asm
index c4b2690cde1ebc713a3c97126210025aef7da6b5..6317b7dca692223ff295dd1fee65c382ca942bf9 100644 (file)
--- a/common/x86/trellis-64.asm
+++ b/common/x86/trellis-64.asm
@@ -600,8 +600,8 @@ TRELLIS trellis_cabac_chroma_422_dc, 8, 1, 0
 INIT_XMM
 %macro clocal 1
     ALIGN 16
-    global mangle(x264_%1)
-    mangle(x264_%1):
+    global mangle(private_prefix %+ _%1)
+    mangle(private_prefix %+ _%1):
     %1:
     %assign stack_offset stack_offset_bak+gprsize
 %endmacro