simplify x86_abi_support.asm symbol declaration

Define LIBVPX_{ELF,MACHO} to simplify blocks.

Create new globalsym macro and include logic for PRIVATE.

BUG=webm:1679

Change-Id: I303ba1492a2813f685de51155ccef7e4831e1881

diff --git a/vp8/common/x86/dequantize_mmx.asm b/vp8/common/x86/dequantize_mmx.asm
index 530576c..0a269e1 100644 (file)
--- a/vp8/common/x86/dequantize_mmx.asm
+++ b/vp8/common/x86/dequantize_mmx.asm
@@ -14,7 +14,7 @@
 SECTION .text
 
 ;void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q)
-global sym(vp8_dequantize_b_impl_mmx)PRIVATE
+globalsym(vp8_dequantize_b_impl_mmx)
 sym(vp8_dequantize_b_impl_mmx):
     push        rbp
     mov         rbp, rsp
@@ -56,7 +56,7 @@ sym(vp8_dequantize_b_impl_mmx):
 ;short *dq,               1
 ;unsigned char *dest,     2
 ;int stride)              3
-global sym(vp8_dequant_idct_add_mmx)PRIVATE
+globalsym(vp8_dequant_idct_add_mmx)
 sym(vp8_dequant_idct_add_mmx):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm
index 20abe99..6cea86f 100644 (file)
--- a/vp8/common/x86/idctllm_mmx.asm
+++ b/vp8/common/x86/idctllm_mmx.asm
@@ -35,7 +35,7 @@ SECTION .text
 
 ;void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred,
 ;int pitch, unsigned char *dest,int stride)
-global sym(vp8_short_idct4x4llm_mmx)PRIVATE
+globalsym(vp8_short_idct4x4llm_mmx)
 sym(vp8_short_idct4x4llm_mmx):
     push        rbp
     mov         rbp, rsp
@@ -225,7 +225,7 @@ sym(vp8_short_idct4x4llm_mmx):
 ;int pred_stride,
 ;unsigned char *dst_ptr,
 ;int stride)
-global sym(vp8_dc_only_idct_add_mmx)PRIVATE
+globalsym(vp8_dc_only_idct_add_mmx)
 sym(vp8_dc_only_idct_add_mmx):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp8/common/x86/idctllm_sse2.asm
index adee2eb..bb79d2d 100644 (file)
--- a/vp8/common/x86/idctllm_sse2.asm
+++ b/vp8/common/x86/idctllm_sse2.asm
@@ -21,7 +21,7 @@
 
 SECTION .text
 
-global sym(vp8_idct_dequant_0_2x_sse2)PRIVATE
+globalsym(vp8_idct_dequant_0_2x_sse2)
 sym(vp8_idct_dequant_0_2x_sse2):
     push        rbp
     mov         rbp, rsp
@@ -103,7 +103,7 @@ sym(vp8_idct_dequant_0_2x_sse2):
 ;   unsigned char *dst  - 2
 ;   int dst_stride      - 3
 ; )
-global sym(vp8_idct_dequant_full_2x_sse2)PRIVATE
+globalsym(vp8_idct_dequant_full_2x_sse2)
 sym(vp8_idct_dequant_full_2x_sse2):
     push        rbp
     mov         rbp, rsp
@@ -360,7 +360,7 @@ sym(vp8_idct_dequant_full_2x_sse2):
 ;   int dst_stride      - 3
 ;   short *dc           - 4
 ; )
-global sym(vp8_idct_dequant_dc_0_2x_sse2)PRIVATE
+globalsym(vp8_idct_dequant_dc_0_2x_sse2)
 sym(vp8_idct_dequant_dc_0_2x_sse2):
     push        rbp
     mov         rbp, rsp
@@ -436,7 +436,7 @@ sym(vp8_idct_dequant_dc_0_2x_sse2):
 ;   int dst_stride      - 3
 ;   short *dc           - 4
 ; )
-global sym(vp8_idct_dequant_dc_full_2x_sse2)PRIVATE
+globalsym(vp8_idct_dequant_dc_full_2x_sse2)
 sym(vp8_idct_dequant_dc_full_2x_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/iwalsh_sse2.asm b/vp8/common/x86/iwalsh_sse2.asm
index 1949582..56f37c3 100644 (file)
--- a/vp8/common/x86/iwalsh_sse2.asm
+++ b/vp8/common/x86/iwalsh_sse2.asm
@@ -14,7 +14,7 @@
 SECTION .text
 
 ;void vp8_short_inv_walsh4x4_sse2(short *input, short *mb_dqcoeff)
-global sym(vp8_short_inv_walsh4x4_sse2)PRIVATE
+globalsym(vp8_short_inv_walsh4x4_sse2)
 sym(vp8_short_inv_walsh4x4_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
index ca17495..8d12f53 100644 (file)
--- a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
+++ b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
@@ -135,7 +135,7 @@ SECTION .text
 ;    const char    *limit,
 ;    const char    *thresh
 ;)
-global sym(vp8_loop_filter_bh_y_sse2)PRIVATE
+globalsym(vp8_loop_filter_bh_y_sse2)
 sym(vp8_loop_filter_bh_y_sse2):
 
 %if LIBVPX_YASM_WIN64
@@ -277,7 +277,7 @@ LF_FILTER xmm0, xmm1, xmm3, xmm8, xmm4, xmm2
 ;    const char    *thresh
 ;)
 
-global sym(vp8_loop_filter_bv_y_sse2)PRIVATE
+globalsym(vp8_loop_filter_bv_y_sse2)
 sym(vp8_loop_filter_bv_y_sse2):
 
 %if LIBVPX_YASM_WIN64

diff --git a/vp8/common/x86/loopfilter_sse2.asm b/vp8/common/x86/loopfilter_sse2.asm
index db624b2..ce5c313 100644 (file)
--- a/vp8/common/x86/loopfilter_sse2.asm
+++ b/vp8/common/x86/loopfilter_sse2.asm
@@ -288,7 +288,7 @@ SECTION .text
 ;    const char    *limit,
 ;    const char    *thresh,
 ;)
-global sym(vp8_loop_filter_horizontal_edge_sse2)PRIVATE
+globalsym(vp8_loop_filter_horizontal_edge_sse2)
 sym(vp8_loop_filter_horizontal_edge_sse2):
     push        rbp
     mov         rbp, rsp
@@ -336,7 +336,7 @@ sym(vp8_loop_filter_horizontal_edge_sse2):
 ;    const char    *thresh,
 ;    int            count
 ;)
-global sym(vp8_loop_filter_horizontal_edge_uv_sse2)PRIVATE
+globalsym(vp8_loop_filter_horizontal_edge_uv_sse2)
 sym(vp8_loop_filter_horizontal_edge_uv_sse2):
     push        rbp
     mov         rbp, rsp
@@ -563,7 +563,7 @@ sym(vp8_loop_filter_horizontal_edge_uv_sse2):
 ;    const char    *limit,
 ;    const char    *thresh,
 ;)
-global sym(vp8_mbloop_filter_horizontal_edge_sse2)PRIVATE
+globalsym(vp8_mbloop_filter_horizontal_edge_sse2)
 sym(vp8_mbloop_filter_horizontal_edge_sse2):
     push        rbp
     mov         rbp, rsp
@@ -609,7 +609,7 @@ sym(vp8_mbloop_filter_horizontal_edge_sse2):
 ;    const char    *thresh,
 ;    unsigned char *v
 ;)
-global sym(vp8_mbloop_filter_horizontal_edge_uv_sse2)PRIVATE
+globalsym(vp8_mbloop_filter_horizontal_edge_uv_sse2)
 sym(vp8_mbloop_filter_horizontal_edge_uv_sse2):
     push        rbp
     mov         rbp, rsp
@@ -930,7 +930,7 @@ sym(vp8_mbloop_filter_horizontal_edge_uv_sse2):
 ;    const char    *limit,
 ;    const char    *thresh,
 ;)
-global sym(vp8_loop_filter_vertical_edge_sse2)PRIVATE
+globalsym(vp8_loop_filter_vertical_edge_sse2)
 sym(vp8_loop_filter_vertical_edge_sse2):
     push        rbp
     mov         rbp, rsp
@@ -995,7 +995,7 @@ sym(vp8_loop_filter_vertical_edge_sse2):
 ;    const char    *thresh,
 ;    unsigned char *v
 ;)
-global sym(vp8_loop_filter_vertical_edge_uv_sse2)PRIVATE
+globalsym(vp8_loop_filter_vertical_edge_uv_sse2)
 sym(vp8_loop_filter_vertical_edge_uv_sse2):
     push        rbp
     mov         rbp, rsp
@@ -1144,7 +1144,7 @@ sym(vp8_loop_filter_vertical_edge_uv_sse2):
 ;    const char    *limit,
 ;    const char    *thresh,
 ;)
-global sym(vp8_mbloop_filter_vertical_edge_sse2)PRIVATE
+globalsym(vp8_mbloop_filter_vertical_edge_sse2)
 sym(vp8_mbloop_filter_vertical_edge_sse2):
     push        rbp
     mov         rbp, rsp
@@ -1211,7 +1211,7 @@ sym(vp8_mbloop_filter_vertical_edge_sse2):
 ;    const char    *thresh,
 ;    unsigned char *v
 ;)
-global sym(vp8_mbloop_filter_vertical_edge_uv_sse2)PRIVATE
+globalsym(vp8_mbloop_filter_vertical_edge_uv_sse2)
 sym(vp8_mbloop_filter_vertical_edge_uv_sse2):
     push        rbp
     mov         rbp, rsp
@@ -1271,7 +1271,7 @@ sym(vp8_mbloop_filter_vertical_edge_uv_sse2):
 ;    int  src_pixel_step,
 ;    const char *blimit,
 ;)
-global sym(vp8_loop_filter_simple_horizontal_edge_sse2)PRIVATE
+globalsym(vp8_loop_filter_simple_horizontal_edge_sse2)
 sym(vp8_loop_filter_simple_horizontal_edge_sse2):
     push        rbp
     mov         rbp, rsp
@@ -1376,7 +1376,7 @@ sym(vp8_loop_filter_simple_horizontal_edge_sse2):
 ;    int  src_pixel_step,
 ;    const char *blimit,
 ;)
-global sym(vp8_loop_filter_simple_vertical_edge_sse2)PRIVATE
+globalsym(vp8_loop_filter_simple_vertical_edge_sse2)
 sym(vp8_loop_filter_simple_vertical_edge_sse2):
     push        rbp         ; save old base pointer value.
     mov         rbp, rsp    ; set new base pointer value.

diff --git a/vp8/common/x86/mfqe_sse2.asm b/vp8/common/x86/mfqe_sse2.asm
index 688d9bf..3ec2a99 100644 (file)
--- a/vp8/common/x86/mfqe_sse2.asm
+++ b/vp8/common/x86/mfqe_sse2.asm
@@ -21,7 +21,7 @@ SECTION .text
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp8_filter_by_weight16x16_sse2)PRIVATE
+globalsym(vp8_filter_by_weight16x16_sse2)
 sym(vp8_filter_by_weight16x16_sse2):
     push        rbp
     mov         rbp, rsp
@@ -99,7 +99,7 @@ sym(vp8_filter_by_weight16x16_sse2):
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp8_filter_by_weight8x8_sse2)PRIVATE
+globalsym(vp8_filter_by_weight8x8_sse2)
 sym(vp8_filter_by_weight8x8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -167,7 +167,7 @@ sym(vp8_filter_by_weight8x8_sse2):
 ;    unsigned int  *variance,      4
 ;    unsigned int  *sad,           5
 ;)
-global sym(vp8_variance_and_sad_16x16_sse2)PRIVATE
+globalsym(vp8_variance_and_sad_16x16_sse2)
 sym(vp8_variance_and_sad_16x16_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/recon_mmx.asm b/vp8/common/x86/recon_mmx.asm
index 6d8abe7..01cf066 100644 (file)
--- a/vp8/common/x86/recon_mmx.asm
+++ b/vp8/common/x86/recon_mmx.asm
@@ -19,7 +19,7 @@ SECTION .text
 ;    unsigned char *dst,
 ;    int dst_stride
 ;    )
-global sym(vp8_copy_mem8x8_mmx)PRIVATE
+globalsym(vp8_copy_mem8x8_mmx)
 sym(vp8_copy_mem8x8_mmx):
     push        rbp
     mov         rbp, rsp
@@ -82,7 +82,7 @@ sym(vp8_copy_mem8x8_mmx):
 ;    unsigned char *dst,
 ;    int dst_stride
 ;    )
-global sym(vp8_copy_mem8x4_mmx)PRIVATE
+globalsym(vp8_copy_mem8x4_mmx)
 sym(vp8_copy_mem8x4_mmx):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/recon_sse2.asm b/vp8/common/x86/recon_sse2.asm
index 20ffb90..17baf09 100644 (file)
--- a/vp8/common/x86/recon_sse2.asm
+++ b/vp8/common/x86/recon_sse2.asm
@@ -19,7 +19,7 @@ SECTION .text
 ;    unsigned char *dst,
 ;    int dst_stride
 ;    )
-global sym(vp8_copy_mem16x16_sse2)PRIVATE
+globalsym(vp8_copy_mem16x16_sse2)
 sym(vp8_copy_mem16x16_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/subpixel_mmx.asm b/vp8/common/x86/subpixel_mmx.asm
index 057bacc..8f0f6fc 100644 (file)
--- a/vp8/common/x86/subpixel_mmx.asm
+++ b/vp8/common/x86/subpixel_mmx.asm
@@ -27,7 +27,7 @@ SECTION .text
 ;    unsigned int    output_width,
 ;    short           * vp8_filter
 ;)
-global sym(vp8_filter_block1d_h6_mmx)PRIVATE
+globalsym(vp8_filter_block1d_h6_mmx)
 sym(vp8_filter_block1d_h6_mmx):
     push        rbp
     mov         rbp, rsp
@@ -124,7 +124,7 @@ sym(vp8_filter_block1d_h6_mmx):
 ;   unsigned int output_width,
 ;   short * vp8_filter
 ;)
-global sym(vp8_filter_block1dc_v6_mmx)PRIVATE
+globalsym(vp8_filter_block1dc_v6_mmx)
 sym(vp8_filter_block1dc_v6_mmx):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/subpixel_sse2.asm b/vp8/common/x86/subpixel_sse2.asm
index a0d1e38..94e14ae 100644 (file)
--- a/vp8/common/x86/subpixel_sse2.asm
+++ b/vp8/common/x86/subpixel_sse2.asm
@@ -33,7 +33,7 @@ SECTION .text
 ;    unsigned int    output_width,
 ;    short           *vp8_filter
 ;)
-global sym(vp8_filter_block1d8_h6_sse2)PRIVATE
+globalsym(vp8_filter_block1d8_h6_sse2)
 sym(vp8_filter_block1d8_h6_sse2):
     push        rbp
     mov         rbp, rsp
@@ -153,7 +153,7 @@ sym(vp8_filter_block1d8_h6_sse2):
 ; even number. This function handles 8 pixels in horizontal direction, calculating ONE
 ; rows each iteration to take advantage of the 128 bits operations.
 ;*************************************************************************************/
-global sym(vp8_filter_block1d16_h6_sse2)PRIVATE
+globalsym(vp8_filter_block1d16_h6_sse2)
 sym(vp8_filter_block1d16_h6_sse2):
     push        rbp
     mov         rbp, rsp
@@ -333,7 +333,7 @@ sym(vp8_filter_block1d16_h6_sse2):
 ; Notes: filter_block1d8_v6 applies a 6 tap filter vertically to the input pixels. The
 ; input pixel array has output_height rows.
 ;*************************************************************************************/
-global sym(vp8_filter_block1d8_v6_sse2)PRIVATE
+globalsym(vp8_filter_block1d8_v6_sse2)
 sym(vp8_filter_block1d8_v6_sse2):
     push        rbp
     mov         rbp, rsp
@@ -428,7 +428,7 @@ sym(vp8_filter_block1d8_v6_sse2):
 ; Notes: filter_block1d16_v6 applies a 6 tap filter vertically to the input pixels. The
 ; input pixel array has output_height rows.
 ;*************************************************************************************/
-global sym(vp8_filter_block1d16_v6_sse2)PRIVATE
+globalsym(vp8_filter_block1d16_v6_sse2)
 sym(vp8_filter_block1d16_v6_sse2):
     push        rbp
     mov         rbp, rsp
@@ -538,7 +538,7 @@ sym(vp8_filter_block1d16_v6_sse2):
 ;    const short    *vp8_filter
 ;)
 ; First-pass filter only when yoffset==0
-global sym(vp8_filter_block1d8_h6_only_sse2)PRIVATE
+globalsym(vp8_filter_block1d8_h6_only_sse2)
 sym(vp8_filter_block1d8_h6_only_sse2):
     push        rbp
     mov         rbp, rsp
@@ -651,7 +651,7 @@ sym(vp8_filter_block1d8_h6_only_sse2):
 ;    const short    *vp8_filter
 ;)
 ; First-pass filter only when yoffset==0
-global sym(vp8_filter_block1d16_h6_only_sse2)PRIVATE
+globalsym(vp8_filter_block1d16_h6_only_sse2)
 sym(vp8_filter_block1d16_h6_only_sse2):
     push        rbp
     mov         rbp, rsp
@@ -816,7 +816,7 @@ sym(vp8_filter_block1d16_h6_only_sse2):
 ;    const short    *vp8_filter
 ;)
 ; Second-pass filter only when xoffset==0
-global sym(vp8_filter_block1d8_v6_only_sse2)PRIVATE
+globalsym(vp8_filter_block1d8_v6_only_sse2)
 sym(vp8_filter_block1d8_v6_only_sse2):
     push        rbp
     mov         rbp, rsp
@@ -908,7 +908,7 @@ sym(vp8_filter_block1d8_v6_only_sse2):
 ;    unsigned int    output_height,
 ;    unsigned int    output_width
 ;)
-global sym(vp8_unpack_block1d16_h6_sse2)PRIVATE
+globalsym(vp8_unpack_block1d16_h6_sse2)
 sym(vp8_unpack_block1d16_h6_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/common/x86/subpixel_ssse3.asm b/vp8/common/x86/subpixel_ssse3.asm
index cc14ccc..1724722 100644 (file)
--- a/vp8/common/x86/subpixel_ssse3.asm
+++ b/vp8/common/x86/subpixel_ssse3.asm
@@ -35,7 +35,7 @@ SECTION .text
 ;    unsigned int    output_height,
 ;    unsigned int    vp8_filter_index
 ;)
-global sym(vp8_filter_block1d8_h6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d8_h6_ssse3)
 sym(vp8_filter_block1d8_h6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -178,7 +178,7 @@ vp8_filter_block1d8_h4_ssse3:
 ;    unsigned int    output_height,
 ;    unsigned int    vp8_filter_index
 ;)
-global sym(vp8_filter_block1d16_h6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d16_h6_ssse3)
 sym(vp8_filter_block1d16_h6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -285,7 +285,7 @@ sym(vp8_filter_block1d16_h6_ssse3):
 ;    unsigned int    output_height,
 ;    unsigned int    vp8_filter_index
 ;)
-global sym(vp8_filter_block1d4_h6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d4_h6_ssse3)
 sym(vp8_filter_block1d4_h6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -415,7 +415,7 @@ sym(vp8_filter_block1d4_h6_ssse3):
 ;    unsigned int   output_height,
 ;    unsigned int   vp8_filter_index
 ;)
-global sym(vp8_filter_block1d16_v6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d16_v6_ssse3)
 sym(vp8_filter_block1d16_v6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -603,7 +603,7 @@ sym(vp8_filter_block1d16_v6_ssse3):
 ;    unsigned int   output_height,
 ;    unsigned int   vp8_filter_index
 ;)
-global sym(vp8_filter_block1d8_v6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d8_v6_ssse3)
 sym(vp8_filter_block1d8_v6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -743,7 +743,7 @@ sym(vp8_filter_block1d8_v6_ssse3):
 ;    unsigned int   output_height,
 ;    unsigned int   vp8_filter_index
 ;)
-global sym(vp8_filter_block1d4_v6_ssse3)PRIVATE
+globalsym(vp8_filter_block1d4_v6_ssse3)
 sym(vp8_filter_block1d4_v6_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -882,7 +882,7 @@ sym(vp8_filter_block1d4_v6_ssse3):
 ;    unsigned char *dst_ptr,
 ;    int dst_pitch
 ;)
-global sym(vp8_bilinear_predict16x16_ssse3)PRIVATE
+globalsym(vp8_bilinear_predict16x16_ssse3)
 sym(vp8_bilinear_predict16x16_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -1145,7 +1145,7 @@ sym(vp8_bilinear_predict16x16_ssse3):
 ;    unsigned char *dst_ptr,
 ;    int dst_pitch
 ;)
-global sym(vp8_bilinear_predict8x8_ssse3)PRIVATE
+globalsym(vp8_bilinear_predict8x8_ssse3)
 sym(vp8_bilinear_predict8x8_ssse3):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/encoder/x86/block_error_sse2.asm b/vp8/encoder/x86/block_error_sse2.asm
index 1078003..200b4cc 100644 (file)
--- a/vp8/encoder/x86/block_error_sse2.asm
+++ b/vp8/encoder/x86/block_error_sse2.asm
@@ -14,7 +14,7 @@
 SECTION .text
 
 ;int vp8_block_error_sse2(short *coeff_ptr,  short *dcoef_ptr)
-global sym(vp8_block_error_sse2)PRIVATE
+globalsym(vp8_block_error_sse2)
 sym(vp8_block_error_sse2):
     push        rbp
     mov         rbp, rsp
@@ -62,7 +62,7 @@ sym(vp8_block_error_sse2):
     ret
 
 ;int vp8_mbblock_error_sse2_impl(short *coeff_ptr, short *dcoef_ptr, int dc);
-global sym(vp8_mbblock_error_sse2_impl)PRIVATE
+globalsym(vp8_mbblock_error_sse2_impl)
 sym(vp8_mbblock_error_sse2_impl):
     push        rbp
     mov         rbp, rsp
@@ -132,7 +132,7 @@ sym(vp8_mbblock_error_sse2_impl):
 
 
 ;int vp8_mbuverror_sse2_impl(short *s_ptr, short *d_ptr);
-global sym(vp8_mbuverror_sse2_impl)PRIVATE
+globalsym(vp8_mbuverror_sse2_impl)
 sym(vp8_mbuverror_sse2_impl):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/encoder/x86/copy_sse2.asm b/vp8/encoder/x86/copy_sse2.asm
index 760ade9..fe78da3 100644 (file)
--- a/vp8/encoder/x86/copy_sse2.asm
+++ b/vp8/encoder/x86/copy_sse2.asm
@@ -19,7 +19,7 @@ SECTION .text
 ;    unsigned char *dst_ptr,
 ;    int  dst_stride,
 ;    int height);
-global sym(vp8_copy32xn_sse2)PRIVATE
+globalsym(vp8_copy32xn_sse2)
 sym(vp8_copy32xn_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/encoder/x86/copy_sse3.asm b/vp8/encoder/x86/copy_sse3.asm
index 086c6f9..c40b2d8 100644 (file)
--- a/vp8/encoder/x86/copy_sse3.asm
+++ b/vp8/encoder/x86/copy_sse3.asm
@@ -91,7 +91,7 @@ SECTION .text
 ;    unsigned char *dst_ptr,
 ;    int  dst_stride,
 ;    int height);
-global sym(vp8_copy32xn_sse3)PRIVATE
+globalsym(vp8_copy32xn_sse3)
 sym(vp8_copy32xn_sse3):
 
     STACK_FRAME_CREATE_X3

diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm
index 26ac8ff..3c28cb9 100644 (file)
--- a/vp8/encoder/x86/dct_sse2.asm
+++ b/vp8/encoder/x86/dct_sse2.asm
@@ -63,7 +63,7 @@
 SECTION .text
 
 ;void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch)
-global sym(vp8_short_fdct4x4_sse2)PRIVATE
+globalsym(vp8_short_fdct4x4_sse2)
 sym(vp8_short_fdct4x4_sse2):
 
     STACK_FRAME_CREATE
@@ -168,7 +168,7 @@ sym(vp8_short_fdct4x4_sse2):
     STACK_FRAME_DESTROY
 
 ;void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch)
-global sym(vp8_short_fdct8x4_sse2)PRIVATE
+globalsym(vp8_short_fdct8x4_sse2)
 sym(vp8_short_fdct8x4_sse2):
 
     STACK_FRAME_CREATE

diff --git a/vp8/encoder/x86/fwalsh_sse2.asm b/vp8/encoder/x86/fwalsh_sse2.asm
index b79334a..938fc17 100644 (file)
--- a/vp8/encoder/x86/fwalsh_sse2.asm
+++ b/vp8/encoder/x86/fwalsh_sse2.asm
@@ -14,7 +14,7 @@
 SECTION .text
 
 ;void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch)
-global sym(vp8_short_walsh4x4_sse2)PRIVATE
+globalsym(vp8_short_walsh4x4_sse2)
 sym(vp8_short_walsh4x4_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vp8/encoder/x86/temporal_filter_apply_sse2.asm b/vp8/encoder/x86/temporal_filter_apply_sse2.asm
index 3bdc21c..6710206 100644 (file)
--- a/vp8/encoder/x86/temporal_filter_apply_sse2.asm
+++ b/vp8/encoder/x86/temporal_filter_apply_sse2.asm
@@ -22,7 +22,7 @@ SECTION .text
 ;   int             filter_weight,    |  5
 ;   unsigned int   *accumulator,      |  6
 ;   unsigned short *count)            |  7
-global sym(vp8_temporal_filter_apply_sse2)PRIVATE
+globalsym(vp8_temporal_filter_apply_sse2)
 sym(vp8_temporal_filter_apply_sse2):
 
     push        rbp

diff --git a/vp9/common/x86/vp9_mfqe_sse2.asm b/vp9/common/x86/vp9_mfqe_sse2.asm
index 551cd7b..ae7c94e 100644 (file)
--- a/vp9/common/x86/vp9_mfqe_sse2.asm
+++ b/vp9/common/x86/vp9_mfqe_sse2.asm
@@ -22,7 +22,7 @@ SECTION .text
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp9_filter_by_weight16x16_sse2)PRIVATE
+globalsym(vp9_filter_by_weight16x16_sse2)
 sym(vp9_filter_by_weight16x16_sse2):
     push        rbp
     mov         rbp, rsp
@@ -100,7 +100,7 @@ sym(vp9_filter_by_weight16x16_sse2):
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp9_filter_by_weight8x8_sse2)PRIVATE
+globalsym(vp9_filter_by_weight8x8_sse2)
 sym(vp9_filter_by_weight8x8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -168,7 +168,7 @@ sym(vp9_filter_by_weight8x8_sse2):
 ;    unsigned int  *variance,      4
 ;    unsigned int  *sad,           5
 ;)
-global sym(vp9_variance_and_sad_16x16_sse2)PRIVATE
+globalsym(vp9_variance_and_sad_16x16_sse2)
 sym(vp9_variance_and_sad_16x16_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/add_noise_sse2.asm b/vpx_dsp/x86/add_noise_sse2.asm
index 953ee28..f51718c 100644 (file)
--- a/vpx_dsp/x86/add_noise_sse2.asm
+++ b/vpx_dsp/x86/add_noise_sse2.asm
@@ -16,7 +16,7 @@ SECTION .text
 ;void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise,
 ;                              int blackclamp, int whiteclamp,
 ;                              int width, int height, int pitch)
-global sym(vpx_plane_add_noise_sse2)PRIVATE
+globalsym(vpx_plane_add_noise_sse2)
 sym(vpx_plane_add_noise_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/deblock_sse2.asm b/vpx_dsp/x86/deblock_sse2.asm
index c8214c9..b3af677 100644 (file)
--- a/vpx_dsp/x86/deblock_sse2.asm
+++ b/vpx_dsp/x86/deblock_sse2.asm
@@ -95,7 +95,7 @@ SECTION .text
 ;    int *flimits,
 ;    int size
 ;)
-global sym(vpx_post_proc_down_and_across_mb_row_sse2)PRIVATE
+globalsym(vpx_post_proc_down_and_across_mb_row_sse2)
 sym(vpx_post_proc_down_and_across_mb_row_sse2):
     push        rbp
     mov         rbp, rsp
@@ -235,7 +235,7 @@ sym(vpx_post_proc_down_and_across_mb_row_sse2):
 
 ;void vpx_mbpost_proc_across_ip_sse2(unsigned char *src,
 ;                                    int pitch, int rows, int cols,int flimit)
-global sym(vpx_mbpost_proc_across_ip_sse2)PRIVATE
+globalsym(vpx_mbpost_proc_across_ip_sse2)
 sym(vpx_mbpost_proc_across_ip_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/highbd_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_variance_impl_sse2.asm
index b2b91f0..5bee51f 100644 (file)
--- a/vpx_dsp/x86/highbd_variance_impl_sse2.asm
+++ b/vpx_dsp/x86/highbd_variance_impl_sse2.asm
@@ -22,7 +22,7 @@ SECTION .text
 ;    unsigned int    *  SSE,
 ;    int             *  Sum
 ;)
-global sym(vpx_highbd_calc16x16var_sse2)PRIVATE
+globalsym(vpx_highbd_calc16x16var_sse2)
 sym(vpx_highbd_calc16x16var_sse2):
     push        rbp
     mov         rbp, rsp
@@ -175,7 +175,7 @@ sym(vpx_highbd_calc16x16var_sse2):
 ;    unsigned int    *  SSE,
 ;    int             *  Sum
 ;)
-global sym(vpx_highbd_calc8x8var_sse2)PRIVATE
+globalsym(vpx_highbd_calc8x8var_sse2)
 sym(vpx_highbd_calc8x8var_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/sad_sse3.asm b/vpx_dsp/x86/sad_sse3.asm
index e43ced0..acbd2e4 100644 (file)
--- a/vpx_dsp/x86/sad_sse3.asm
+++ b/vpx_dsp/x86/sad_sse3.asm
@@ -173,7 +173,7 @@ SECTION .text
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad16x16x3_sse3)PRIVATE
+globalsym(vpx_sad16x16x3_sse3)
 sym(vpx_sad16x16x3_sse3):
 
     STACK_FRAME_CREATE_X3
@@ -215,7 +215,7 @@ sym(vpx_sad16x16x3_sse3):
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad16x8x3_sse3)PRIVATE
+globalsym(vpx_sad16x8x3_sse3)
 sym(vpx_sad16x8x3_sse3):
 
     STACK_FRAME_CREATE_X3
@@ -253,7 +253,7 @@ sym(vpx_sad16x8x3_sse3):
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad8x16x3_sse3)PRIVATE
+globalsym(vpx_sad8x16x3_sse3)
 sym(vpx_sad8x16x3_sse3):
 
     STACK_FRAME_CREATE_X3
@@ -282,7 +282,7 @@ sym(vpx_sad8x16x3_sse3):
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad8x8x3_sse3)PRIVATE
+globalsym(vpx_sad8x8x3_sse3)
 sym(vpx_sad8x8x3_sse3):
 
     STACK_FRAME_CREATE_X3
@@ -307,7 +307,7 @@ sym(vpx_sad8x8x3_sse3):
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad4x4x3_sse3)PRIVATE
+globalsym(vpx_sad4x4x3_sse3)
 sym(vpx_sad4x4x3_sse3):
 
     STACK_FRAME_CREATE_X3

diff --git a/vpx_dsp/x86/sad_sse4.asm b/vpx_dsp/x86/sad_sse4.asm
index d07607a..0818ed5 100644 (file)
--- a/vpx_dsp/x86/sad_sse4.asm
+++ b/vpx_dsp/x86/sad_sse4.asm
@@ -173,7 +173,7 @@ SECTION .text
 ;    const unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    unsigned short *sad_array);
-global sym(vpx_sad16x16x8_sse4_1)PRIVATE
+globalsym(vpx_sad16x16x8_sse4_1)
 sym(vpx_sad16x16x8_sse4_1):
     push        rbp
     mov         rbp, rsp
@@ -214,7 +214,7 @@ sym(vpx_sad16x16x8_sse4_1):
 ;    int  ref_stride,
 ;    unsigned short *sad_array
 ;);
-global sym(vpx_sad16x8x8_sse4_1)PRIVATE
+globalsym(vpx_sad16x8x8_sse4_1)
 sym(vpx_sad16x8x8_sse4_1):
     push        rbp
     mov         rbp, rsp
@@ -251,7 +251,7 @@ sym(vpx_sad16x8x8_sse4_1):
 ;    int  ref_stride,
 ;    unsigned short *sad_array
 ;);
-global sym(vpx_sad8x8x8_sse4_1)PRIVATE
+globalsym(vpx_sad8x8x8_sse4_1)
 sym(vpx_sad8x8x8_sse4_1):
     push        rbp
     mov         rbp, rsp
@@ -288,7 +288,7 @@ sym(vpx_sad8x8x8_sse4_1):
 ;    int  ref_stride,
 ;    unsigned short *sad_array
 ;);
-global sym(vpx_sad8x16x8_sse4_1)PRIVATE
+globalsym(vpx_sad8x16x8_sse4_1)
 sym(vpx_sad8x16x8_sse4_1):
     push        rbp
     mov         rbp, rsp
@@ -329,7 +329,7 @@ sym(vpx_sad8x16x8_sse4_1):
 ;    int  ref_stride,
 ;    unsigned short *sad_array
 ;);
-global sym(vpx_sad4x4x8_sse4_1)PRIVATE
+globalsym(vpx_sad4x4x8_sse4_1)
 sym(vpx_sad4x4x8_sse4_1):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/sad_ssse3.asm b/vpx_dsp/x86/sad_ssse3.asm
index d5c837f..a5bc6d7 100644 (file)
--- a/vpx_dsp/x86/sad_ssse3.asm
+++ b/vpx_dsp/x86/sad_ssse3.asm
@@ -154,7 +154,7 @@ SECTION .text
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad16x16x3_ssse3)PRIVATE
+globalsym(vpx_sad16x16x3_ssse3)
 sym(vpx_sad16x16x3_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -267,7 +267,7 @@ sym(vpx_sad16x16x3_ssse3):
 ;    unsigned char *ref_ptr,
 ;    int  ref_stride,
 ;    int  *results)
-global sym(vpx_sad16x8x3_ssse3)PRIVATE
+globalsym(vpx_sad16x8x3_ssse3)
 sym(vpx_sad16x8x3_ssse3):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/ssim_opt_x86_64.asm b/vpx_dsp/x86/ssim_opt_x86_64.asm
index 38d9b05..41ffbb0 100644 (file)
--- a/vpx_dsp/x86/ssim_opt_x86_64.asm
+++ b/vpx_dsp/x86/ssim_opt_x86_64.asm
@@ -64,7 +64,7 @@ SECTION .text
 ; or pavgb At this point this is just meant to be first pass for calculating
 ; all the parms needed for 16x16 ssim so we can play with dssim as distortion
 ; in mode selection code.
-global sym(vpx_ssim_parms_16x16_sse2)PRIVATE
+globalsym(vpx_ssim_parms_16x16_sse2)
 sym(vpx_ssim_parms_16x16_sse2):
     push        rbp
     mov         rbp, rsp
@@ -154,7 +154,7 @@ sym(vpx_ssim_parms_16x16_sse2):
 ; or pavgb At this point this is just meant to be first pass for calculating
 ; all the parms needed for 16x16 ssim so we can play with dssim as distortion
 ; in mode selection code.
-global sym(vpx_ssim_parms_8x8_sse2)PRIVATE
+globalsym(vpx_ssim_parms_8x8_sse2)
 sym(vpx_ssim_parms_8x8_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
index 9efb8a1..fc301fb 100644 (file)
--- a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
+++ b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
@@ -208,7 +208,7 @@ SECTION .text
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d4_v8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_v8_sse2)
 sym(vpx_highbd_filter_block1d4_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -278,7 +278,7 @@ sym(vpx_highbd_filter_block1d4_v8_sse2):
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d8_v8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_v8_sse2)
 sym(vpx_highbd_filter_block1d8_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -337,7 +337,7 @@ sym(vpx_highbd_filter_block1d8_v8_sse2):
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d16_v8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_v8_sse2)
 sym(vpx_highbd_filter_block1d16_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -391,7 +391,7 @@ sym(vpx_highbd_filter_block1d16_v8_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d4_v8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_v8_avg_sse2)
 sym(vpx_highbd_filter_block1d4_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -452,7 +452,7 @@ sym(vpx_highbd_filter_block1d4_v8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d8_v8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_v8_avg_sse2)
 sym(vpx_highbd_filter_block1d8_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -501,7 +501,7 @@ sym(vpx_highbd_filter_block1d8_v8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_v8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_v8_avg_sse2)
 sym(vpx_highbd_filter_block1d16_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -563,7 +563,7 @@ sym(vpx_highbd_filter_block1d16_v8_avg_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d4_h8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_h8_sse2)
 sym(vpx_highbd_filter_block1d4_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -638,7 +638,7 @@ sym(vpx_highbd_filter_block1d4_h8_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d8_h8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_h8_sse2)
 sym(vpx_highbd_filter_block1d8_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -704,7 +704,7 @@ sym(vpx_highbd_filter_block1d8_h8_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_highbd_filter_block1d16_h8_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_h8_sse2)
 sym(vpx_highbd_filter_block1d16_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -772,7 +772,7 @@ sym(vpx_highbd_filter_block1d16_h8_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d4_h8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_h8_avg_sse2)
 sym(vpx_highbd_filter_block1d4_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -838,7 +838,7 @@ sym(vpx_highbd_filter_block1d4_h8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d8_h8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_h8_avg_sse2)
 sym(vpx_highbd_filter_block1d8_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -895,7 +895,7 @@ sym(vpx_highbd_filter_block1d8_h8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_h8_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_h8_avg_sse2)
 sym(vpx_highbd_filter_block1d16_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
index eea717a..bd51c75 100644 (file)
--- a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
+++ b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
@@ -173,7 +173,7 @@
 
 SECTION .text
 
-global sym(vpx_highbd_filter_block1d4_v2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_v2_sse2)
 sym(vpx_highbd_filter_block1d4_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -198,7 +198,7 @@ sym(vpx_highbd_filter_block1d4_v2_sse2):
     ret
 
 %if VPX_ARCH_X86_64
-global sym(vpx_highbd_filter_block1d8_v2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_v2_sse2)
 sym(vpx_highbd_filter_block1d8_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -224,7 +224,7 @@ sym(vpx_highbd_filter_block1d8_v2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_v2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_v2_sse2)
 sym(vpx_highbd_filter_block1d16_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -253,7 +253,7 @@ sym(vpx_highbd_filter_block1d16_v2_sse2):
     ret
 %endif
 
-global sym(vpx_highbd_filter_block1d4_v2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_v2_avg_sse2)
 sym(vpx_highbd_filter_block1d4_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -278,7 +278,7 @@ sym(vpx_highbd_filter_block1d4_v2_avg_sse2):
     ret
 
 %if VPX_ARCH_X86_64
-global sym(vpx_highbd_filter_block1d8_v2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_v2_avg_sse2)
 sym(vpx_highbd_filter_block1d8_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -304,7 +304,7 @@ sym(vpx_highbd_filter_block1d8_v2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_v2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_v2_avg_sse2)
 sym(vpx_highbd_filter_block1d16_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -333,7 +333,7 @@ sym(vpx_highbd_filter_block1d16_v2_avg_sse2):
     ret
 %endif
 
-global sym(vpx_highbd_filter_block1d4_h2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_h2_sse2)
 sym(vpx_highbd_filter_block1d4_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -359,7 +359,7 @@ sym(vpx_highbd_filter_block1d4_h2_sse2):
     ret
 
 %if VPX_ARCH_X86_64
-global sym(vpx_highbd_filter_block1d8_h2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_h2_sse2)
 sym(vpx_highbd_filter_block1d8_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -385,7 +385,7 @@ sym(vpx_highbd_filter_block1d8_h2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_h2_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_h2_sse2)
 sym(vpx_highbd_filter_block1d16_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -414,7 +414,7 @@ sym(vpx_highbd_filter_block1d16_h2_sse2):
     ret
 %endif
 
-global sym(vpx_highbd_filter_block1d4_h2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d4_h2_avg_sse2)
 sym(vpx_highbd_filter_block1d4_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -440,7 +440,7 @@ sym(vpx_highbd_filter_block1d4_h2_avg_sse2):
     ret
 
 %if VPX_ARCH_X86_64
-global sym(vpx_highbd_filter_block1d8_h2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d8_h2_avg_sse2)
 sym(vpx_highbd_filter_block1d8_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -466,7 +466,7 @@ sym(vpx_highbd_filter_block1d8_h2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_highbd_filter_block1d16_h2_avg_sse2)PRIVATE
+globalsym(vpx_highbd_filter_block1d16_h2_avg_sse2)
 sym(vpx_highbd_filter_block1d16_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
index b6b2478..c8455e1 100644 (file)
--- a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
+++ b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
@@ -187,7 +187,7 @@ SECTION .text
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d4_v8_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_v8_sse2)
 sym(vpx_filter_block1d4_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -254,7 +254,7 @@ sym(vpx_filter_block1d4_v8_sse2):
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d8_v8_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_v8_sse2)
 sym(vpx_filter_block1d8_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -313,7 +313,7 @@ sym(vpx_filter_block1d8_v8_sse2):
 ;    unsigned int   output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d16_v8_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_v8_sse2)
 sym(vpx_filter_block1d16_v8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -367,7 +367,7 @@ sym(vpx_filter_block1d16_v8_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_v8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_v8_avg_sse2)
 sym(vpx_filter_block1d4_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -425,7 +425,7 @@ sym(vpx_filter_block1d4_v8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_v8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_v8_avg_sse2)
 sym(vpx_filter_block1d8_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -474,7 +474,7 @@ sym(vpx_filter_block1d8_v8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_v8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_v8_avg_sse2)
 sym(vpx_filter_block1d16_v8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -536,7 +536,7 @@ sym(vpx_filter_block1d16_v8_avg_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d4_h8_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_h8_sse2)
 sym(vpx_filter_block1d4_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -610,7 +610,7 @@ sym(vpx_filter_block1d4_h8_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d8_h8_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_h8_sse2)
 sym(vpx_filter_block1d8_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -685,7 +685,7 @@ sym(vpx_filter_block1d8_h8_sse2):
 ;    unsigned int    output_height,
 ;    short *filter
 ;)
-global sym(vpx_filter_block1d16_h8_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_h8_sse2)
 sym(vpx_filter_block1d16_h8_sse2):
     push        rbp
     mov         rbp, rsp
@@ -771,7 +771,7 @@ sym(vpx_filter_block1d16_h8_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_h8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_h8_avg_sse2)
 sym(vpx_filter_block1d4_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -836,7 +836,7 @@ sym(vpx_filter_block1d4_h8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_h8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_h8_avg_sse2)
 sym(vpx_filter_block1d8_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -902,7 +902,7 @@ sym(vpx_filter_block1d8_h8_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_h8_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_h8_avg_sse2)
 sym(vpx_filter_block1d16_h8_avg_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
index b0344f3..65790b1 100644 (file)
--- a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
+++ b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
@@ -133,7 +133,7 @@
 
 SECTION .text
 
-global sym(vpx_filter_block1d4_v2_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_v2_sse2)
 sym(vpx_filter_block1d4_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -157,7 +157,7 @@ sym(vpx_filter_block1d4_v2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_v2_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_v2_sse2)
 sym(vpx_filter_block1d8_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -183,7 +183,7 @@ sym(vpx_filter_block1d8_v2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_v2_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_v2_sse2)
 sym(vpx_filter_block1d16_v2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -211,7 +211,7 @@ sym(vpx_filter_block1d16_v2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_v2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_v2_avg_sse2)
 sym(vpx_filter_block1d4_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -235,7 +235,7 @@ sym(vpx_filter_block1d4_v2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_v2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_v2_avg_sse2)
 sym(vpx_filter_block1d8_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -261,7 +261,7 @@ sym(vpx_filter_block1d8_v2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_v2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_v2_avg_sse2)
 sym(vpx_filter_block1d16_v2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -289,7 +289,7 @@ sym(vpx_filter_block1d16_v2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_h2_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_h2_sse2)
 sym(vpx_filter_block1d4_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -314,7 +314,7 @@ sym(vpx_filter_block1d4_h2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_h2_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_h2_sse2)
 sym(vpx_filter_block1d8_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -341,7 +341,7 @@ sym(vpx_filter_block1d8_h2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_h2_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_h2_sse2)
 sym(vpx_filter_block1d16_h2_sse2):
     push        rbp
     mov         rbp, rsp
@@ -369,7 +369,7 @@ sym(vpx_filter_block1d16_h2_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_h2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d4_h2_avg_sse2)
 sym(vpx_filter_block1d4_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -394,7 +394,7 @@ sym(vpx_filter_block1d4_h2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_h2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d8_h2_avg_sse2)
 sym(vpx_filter_block1d8_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp
@@ -421,7 +421,7 @@ sym(vpx_filter_block1d8_h2_avg_sse2):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_h2_avg_sse2)PRIVATE
+globalsym(vpx_filter_block1d16_h2_avg_sse2)
 sym(vpx_filter_block1d16_h2_avg_sse2):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
index 85f8a4d..32e3cd3 100644 (file)
--- a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
+++ b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
@@ -107,7 +107,7 @@
 
 SECTION .text
 
-global sym(vpx_filter_block1d4_v2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d4_v2_ssse3)
 sym(vpx_filter_block1d4_v2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -131,7 +131,7 @@ sym(vpx_filter_block1d4_v2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_v2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d8_v2_ssse3)
 sym(vpx_filter_block1d8_v2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -157,7 +157,7 @@ sym(vpx_filter_block1d8_v2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_v2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d16_v2_ssse3)
 sym(vpx_filter_block1d16_v2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -184,7 +184,7 @@ sym(vpx_filter_block1d16_v2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_v2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d4_v2_avg_ssse3)
 sym(vpx_filter_block1d4_v2_avg_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -208,7 +208,7 @@ sym(vpx_filter_block1d4_v2_avg_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_v2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d8_v2_avg_ssse3)
 sym(vpx_filter_block1d8_v2_avg_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -234,7 +234,7 @@ sym(vpx_filter_block1d8_v2_avg_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_v2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d16_v2_avg_ssse3)
 sym(vpx_filter_block1d16_v2_avg_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -261,7 +261,7 @@ sym(vpx_filter_block1d16_v2_avg_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_h2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d4_h2_ssse3)
 sym(vpx_filter_block1d4_h2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -286,7 +286,7 @@ sym(vpx_filter_block1d4_h2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_h2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d8_h2_ssse3)
 sym(vpx_filter_block1d8_h2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -313,7 +313,7 @@ sym(vpx_filter_block1d8_h2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_h2_ssse3)PRIVATE
+globalsym(vpx_filter_block1d16_h2_ssse3)
 sym(vpx_filter_block1d16_h2_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -340,7 +340,7 @@ sym(vpx_filter_block1d16_h2_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d4_h2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d4_h2_avg_ssse3)
 sym(vpx_filter_block1d4_h2_avg_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -365,7 +365,7 @@ sym(vpx_filter_block1d4_h2_avg_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d8_h2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d8_h2_avg_ssse3)
 sym(vpx_filter_block1d8_h2_avg_ssse3):
     push        rbp
     mov         rbp, rsp
@@ -392,7 +392,7 @@ sym(vpx_filter_block1d8_h2_avg_ssse3):
     pop         rbp
     ret
 
-global sym(vpx_filter_block1d16_h2_avg_ssse3)PRIVATE
+globalsym(vpx_filter_block1d16_h2_avg_ssse3)
 sym(vpx_filter_block1d16_h2_avg_ssse3):
     push        rbp
     mov         rbp, rsp

diff --git a/vpx_ports/emms_mmx.asm b/vpx_ports/emms_mmx.asm
index ee7595e..b31b25e 100644 (file)
--- a/vpx_ports/emms_mmx.asm
+++ b/vpx_ports/emms_mmx.asm
@@ -12,7 +12,7 @@
 %include "vpx_ports/x86_abi_support.asm"
 
 section .text
-global sym(vpx_clear_system_state)PRIVATE
+globalsym(vpx_clear_system_state)
 sym(vpx_clear_system_state):
     emms
     ret

diff --git a/vpx_ports/float_control_word.asm b/vpx_ports/float_control_word.asm
index d9d000a..bb75b7a 100644 (file)
--- a/vpx_ports/float_control_word.asm
+++ b/vpx_ports/float_control_word.asm
@@ -14,7 +14,7 @@
 section .text
 
 %if LIBVPX_YASM_WIN64
-global sym(vpx_winx64_fldcw)PRIVATE
+globalsym(vpx_winx64_fldcw)
 sym(vpx_winx64_fldcw):
     sub   rsp, 8
     mov   [rsp], rcx ; win x64 specific
@@ -23,7 +23,7 @@ sym(vpx_winx64_fldcw):
     ret
 
 
-global sym(vpx_winx64_fstcw)PRIVATE
+globalsym(vpx_winx64_fstcw)
 sym(vpx_winx64_fstcw):
     sub   rsp, 8
     fstcw [rsp]

diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm
index 420aa66..6b2d6b9 100644 (file)
--- a/vpx_ports/x86_abi_support.asm
+++ b/vpx_ports/x86_abi_support.asm
@@ -89,34 +89,51 @@
 %define LIBVPX_YASM_WIN64 0
 %endif
 
+; Declare groups of platforms
+%ifidn   __OUTPUT_FORMAT__,elf32
+  %define LIBVPX_ELF 1
+%elifidn   __OUTPUT_FORMAT__,elfx32
+  %define LIBVPX_ELF 1
+%elifidn   __OUTPUT_FORMAT__,elf64
+  %define LIBVPX_ELF 1
+%else
+  %define LIBVPX_ELF 0
+%endif
+
+%ifidn __OUTPUT_FORMAT__,macho32
+  %define LIBVPX_MACHO 1
+%elifidn __OUTPUT_FORMAT__,macho64
+  %define LIBVPX_MACHO 1
+%else
+  %define LIBVPX_MACHO 0
+%endif
+
 ; sym()
 ; Return the proper symbol name for the target ABI.
 ;
 ; Certain ABIs, notably MS COFF and Darwin MACH-O, require that symbols
 ; with C linkage be prefixed with an underscore.
 ;
-%ifidn   __OUTPUT_FORMAT__,elf32
-%define sym(x) x
-%elifidn __OUTPUT_FORMAT__,elf64
-%define sym(x) x
-%elifidn __OUTPUT_FORMAT__,elfx32
-%define sym(x) x
-%elif LIBVPX_YASM_WIN64
-%define sym(x) x
+%if LIBVPX_ELF || LIBVPX_YASM_WIN64
+  %define sym(x) x
 %else
-%define sym(x) _ %+ x
+  ; Mach-O / COFF
+  %define sym(x) _ %+ x
 %endif
 
-;  PRIVATE
-;  Macro for the attribute to hide a global symbol for the target ABI.
-;  This is only active if CHROMIUM is defined.
+; globalsym()
+; Return a global declaration with the proper decoration for the target ABI.
+;
+; When CHROMIUM is defined, include attributes to hide the symbol from the
+; global namespace.
 ;
-;  Chromium doesn't like exported global symbols due to symbol clashing with
-;  plugins among other things.
+; Chromium doesn't like exported global symbols due to symbol clashing with
+; plugins among other things.
 ;
-;  Requires Chromium's patched copy of yasm:
-;    http://src.chromium.org/viewvc/chrome?view=rev&revision=73761
-;    http://www.tortall.net/projects/yasm/ticket/236
+; Requires Chromium's patched copy of yasm:
+;   http://src.chromium.org/viewvc/chrome?view=rev&revision=73761
+;   http://www.tortall.net/projects/yasm/ticket/236
+; or nasm > 2.14.
 ;
 %ifdef CHROMIUM
   %ifdef __NASM_VER__
@@ -126,21 +143,16 @@
     %endif
   %endif
 
-  %ifidn   __OUTPUT_FORMAT__,elf32
-    %define PRIVATE :function hidden
-  %elifidn __OUTPUT_FORMAT__,elf64
-    %define PRIVATE :function hidden
-  %elifidn __OUTPUT_FORMAT__,elfx32
-    %define PRIVATE :function hidden
-  %elifidn __OUTPUT_FORMAT__,macho32
-    %define PRIVATE :private_extern
-  %elifidn __OUTPUT_FORMAT__,macho64
-    %define PRIVATE :private_extern
+  %if LIBVPX_ELF
+    %define globalsym(x) global sym(x) %+ :function hidden
+  %elif LIBVPX_MACHO
+    %define globalsym(x) global sym(x) %+ :private_extern
   %else
-    %define PRIVATE
+    ; COFF / PE32+
+    %define globalsym(x) global sym(x)
   %endif
 %else
-  %define PRIVATE
+  %define globalsym(x) global sym(x)
 %endif
 
 ; arg()