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

6 files changed, 9 insertions, 9 deletions

diff --git a/vp8/encoder/x86/block_error_sse2.asm b/vp8/encoder/x86/block_error_sse2.asm
index 107800302..200b4ccfe 100644
--- 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 760ade95b..fe78da398 100644
--- 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 086c6f990..c40b2d8bf 100644
--- 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 26ac8ffa2..3c28cb902 100644
--- 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 b79334a9d..938fc173f 100644
--- 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 3bdc21c93..67102064a 100644
--- 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