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

12 files changed, 79 insertions, 79 deletions

diff --git a/vpx_dsp/x86/add_noise_sse2.asm b/vpx_dsp/x86/add_noise_sse2.asm
index 953ee28d5..f51718cf9 100644
--- 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 c8214c99f..b3af677d2 100644
--- 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 b2b91f02e..5bee51fa0 100644
--- 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 e43ced066..acbd2e4fa 100644
--- 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 d07607aa4..0818ed5f0 100644
--- 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 d5c837f2a..a5bc6d730 100644
--- 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 38d9b058c..41ffbb07e 100644
--- 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 9efb8a171..fc301fb39 100644
--- 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 eea717a33..bd51c75bc 100644
--- 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 b6b2478c7..c8455e13a 100644
--- 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 b0344f3dd..65790b1c2 100644
--- 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 85f8a4d3b..32e3cd3d9 100644
--- 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