From: mayeut Date: Fri, 23 Feb 2018 20:56:32 +0000 (+0100) Subject: Make SIMD symbols private for x86[-64] ELF builds X-Git-Tag: 1.5.90~33 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88421563ad6253d56f00e65f4e7977d2b807a0e3;p=libjpeg-turbo Make SIMD symbols private for x86[-64] ELF builds --- diff --git a/simd/i386/jccolext-avx2.asm b/simd/i386/jccolext-avx2.asm index 19e05c0..914df7c 100644 --- a/simd/i386/jccolext-avx2.asm +++ b/simd/i386/jccolext-avx2.asm @@ -41,7 +41,7 @@ align 32 - global EXTN(jsimd_rgb_ycc_convert_avx2) + GLOBAL_FUNCTION(jsimd_rgb_ycc_convert_avx2) EXTN(jsimd_rgb_ycc_convert_avx2): push ebp diff --git a/simd/i386/jccolext-mmx.asm b/simd/i386/jccolext-mmx.asm index 4748b20..ae91533 100644 --- a/simd/i386/jccolext-mmx.asm +++ b/simd/i386/jccolext-mmx.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_rgb_ycc_convert_mmx) + GLOBAL_FUNCTION(jsimd_rgb_ycc_convert_mmx) EXTN(jsimd_rgb_ycc_convert_mmx): push ebp diff --git a/simd/i386/jccolext-sse2.asm b/simd/i386/jccolext-sse2.asm index 611d804..6e910d9 100644 --- a/simd/i386/jccolext-sse2.asm +++ b/simd/i386/jccolext-sse2.asm @@ -40,7 +40,7 @@ align 32 - global EXTN(jsimd_rgb_ycc_convert_sse2) + GLOBAL_FUNCTION(jsimd_rgb_ycc_convert_sse2) EXTN(jsimd_rgb_ycc_convert_sse2): push ebp diff --git a/simd/i386/jccolor-avx2.asm b/simd/i386/jccolor-avx2.asm index 9d8c56a..7e13824 100644 --- a/simd/i386/jccolor-avx2.asm +++ b/simd/i386/jccolor-avx2.asm @@ -36,7 +36,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_ycc_convert_avx2) + GLOBAL_DATA(jconst_rgb_ycc_convert_avx2) EXTN(jconst_rgb_ycc_convert_avx2): diff --git a/simd/i386/jccolor-mmx.asm b/simd/i386/jccolor-mmx.asm index aecdeed..6169b93 100644 --- a/simd/i386/jccolor-mmx.asm +++ b/simd/i386/jccolor-mmx.asm @@ -36,7 +36,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_ycc_convert_mmx) + GLOBAL_DATA(jconst_rgb_ycc_convert_mmx) EXTN(jconst_rgb_ycc_convert_mmx): diff --git a/simd/i386/jccolor-sse2.asm b/simd/i386/jccolor-sse2.asm index f9b4c91..2f4fc06 100644 --- a/simd/i386/jccolor-sse2.asm +++ b/simd/i386/jccolor-sse2.asm @@ -35,7 +35,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_ycc_convert_sse2) + GLOBAL_DATA(jconst_rgb_ycc_convert_sse2) EXTN(jconst_rgb_ycc_convert_sse2): diff --git a/simd/i386/jcgray-avx2.asm b/simd/i386/jcgray-avx2.asm index 5d78e63..0752d47 100644 --- a/simd/i386/jcgray-avx2.asm +++ b/simd/i386/jcgray-avx2.asm @@ -32,7 +32,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_gray_convert_avx2) + GLOBAL_DATA(jconst_rgb_gray_convert_avx2) EXTN(jconst_rgb_gray_convert_avx2): diff --git a/simd/i386/jcgray-mmx.asm b/simd/i386/jcgray-mmx.asm index 48decc8..07e79b6 100644 --- a/simd/i386/jcgray-mmx.asm +++ b/simd/i386/jcgray-mmx.asm @@ -32,7 +32,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_gray_convert_mmx) + GLOBAL_DATA(jconst_rgb_gray_convert_mmx) EXTN(jconst_rgb_gray_convert_mmx): diff --git a/simd/i386/jcgray-sse2.asm b/simd/i386/jcgray-sse2.asm index dedfc8a..739937b 100644 --- a/simd/i386/jcgray-sse2.asm +++ b/simd/i386/jcgray-sse2.asm @@ -31,7 +31,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_gray_convert_sse2) + GLOBAL_DATA(jconst_rgb_gray_convert_sse2) EXTN(jconst_rgb_gray_convert_sse2): diff --git a/simd/i386/jcgryext-avx2.asm b/simd/i386/jcgryext-avx2.asm index 4f81c20..0c71cd7 100644 --- a/simd/i386/jcgryext-avx2.asm +++ b/simd/i386/jcgryext-avx2.asm @@ -41,7 +41,7 @@ align 32 - global EXTN(jsimd_rgb_gray_convert_avx2) + GLOBAL_FUNCTION(jsimd_rgb_gray_convert_avx2) EXTN(jsimd_rgb_gray_convert_avx2): push ebp diff --git a/simd/i386/jcgryext-mmx.asm b/simd/i386/jcgryext-mmx.asm index 841eb0b..4913f7d 100644 --- a/simd/i386/jcgryext-mmx.asm +++ b/simd/i386/jcgryext-mmx.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_rgb_gray_convert_mmx) + GLOBAL_FUNCTION(jsimd_rgb_gray_convert_mmx) EXTN(jsimd_rgb_gray_convert_mmx): push ebp diff --git a/simd/i386/jcgryext-sse2.asm b/simd/i386/jcgryext-sse2.asm index 40505a5..210443e 100644 --- a/simd/i386/jcgryext-sse2.asm +++ b/simd/i386/jcgryext-sse2.asm @@ -40,7 +40,7 @@ align 32 - global EXTN(jsimd_rgb_gray_convert_sse2) + GLOBAL_FUNCTION(jsimd_rgb_gray_convert_sse2) EXTN(jsimd_rgb_gray_convert_sse2): push ebp diff --git a/simd/i386/jchuff-sse2.asm b/simd/i386/jchuff-sse2.asm index 85b748a..e29f33c 100644 --- a/simd/i386/jchuff-sse2.asm +++ b/simd/i386/jchuff-sse2.asm @@ -26,7 +26,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_huff_encode_one_block) + GLOBAL_DATA(jconst_huff_encode_one_block) EXTN(jconst_huff_encode_one_block): @@ -179,7 +179,7 @@ EXTN(jconst_huff_encode_one_block): %define put_bits edi align 32 - global EXTN(jsimd_huff_encode_one_block_sse2) + GLOBAL_FUNCTION(jsimd_huff_encode_one_block_sse2) EXTN(jsimd_huff_encode_one_block_sse2): push ebp diff --git a/simd/i386/jcsample-avx2.asm b/simd/i386/jcsample-avx2.asm index 9efd415..8e9080c 100644 --- a/simd/i386/jcsample-avx2.asm +++ b/simd/i386/jcsample-avx2.asm @@ -41,7 +41,7 @@ %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v1_downsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_downsample_avx2) EXTN(jsimd_h2v1_downsample_avx2): push ebp @@ -213,7 +213,7 @@ EXTN(jsimd_h2v1_downsample_avx2): %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v2_downsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_downsample_avx2) EXTN(jsimd_h2v2_downsample_avx2): push ebp diff --git a/simd/i386/jcsample-mmx.asm b/simd/i386/jcsample-mmx.asm index 2fa6a1a..1bb4314 100644 --- a/simd/i386/jcsample-mmx.asm +++ b/simd/i386/jcsample-mmx.asm @@ -40,7 +40,7 @@ %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v1_downsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v1_downsample_mmx) EXTN(jsimd_h2v1_downsample_mmx): push ebp @@ -182,7 +182,7 @@ EXTN(jsimd_h2v1_downsample_mmx): %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v2_downsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v2_downsample_mmx) EXTN(jsimd_h2v2_downsample_mmx): push ebp diff --git a/simd/i386/jcsample-sse2.asm b/simd/i386/jcsample-sse2.asm index 3d34ab9..13772ee 100644 --- a/simd/i386/jcsample-sse2.asm +++ b/simd/i386/jcsample-sse2.asm @@ -40,7 +40,7 @@ %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v1_downsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_downsample_sse2) EXTN(jsimd_h2v1_downsample_sse2): push ebp @@ -195,7 +195,7 @@ EXTN(jsimd_h2v1_downsample_sse2): %define output_data(b) (b)+28 ; JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v2_downsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_downsample_sse2) EXTN(jsimd_h2v2_downsample_sse2): push ebp diff --git a/simd/i386/jdcolext-avx2.asm b/simd/i386/jdcolext-avx2.asm index 1222b77..81789bf 100644 --- a/simd/i386/jdcolext-avx2.asm +++ b/simd/i386/jdcolext-avx2.asm @@ -41,7 +41,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_ycc_rgb_convert_avx2) + GLOBAL_FUNCTION(jsimd_ycc_rgb_convert_avx2) EXTN(jsimd_ycc_rgb_convert_avx2): push ebp diff --git a/simd/i386/jdcolext-mmx.asm b/simd/i386/jdcolext-mmx.asm index 1f0614e..c07be02 100644 --- a/simd/i386/jdcolext-mmx.asm +++ b/simd/i386/jdcolext-mmx.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_ycc_rgb_convert_mmx) + GLOBAL_FUNCTION(jsimd_ycc_rgb_convert_mmx) EXTN(jsimd_ycc_rgb_convert_mmx): push ebp diff --git a/simd/i386/jdcolext-sse2.asm b/simd/i386/jdcolext-sse2.asm index 69462ef..1200d42 100644 --- a/simd/i386/jdcolext-sse2.asm +++ b/simd/i386/jdcolext-sse2.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_ycc_rgb_convert_sse2) + GLOBAL_FUNCTION(jsimd_ycc_rgb_convert_sse2) EXTN(jsimd_ycc_rgb_convert_sse2): push ebp diff --git a/simd/i386/jdcolor-avx2.asm b/simd/i386/jdcolor-avx2.asm index f312064..e7fd7ce 100644 --- a/simd/i386/jdcolor-avx2.asm +++ b/simd/i386/jdcolor-avx2.asm @@ -35,7 +35,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_ycc_rgb_convert_avx2) + GLOBAL_DATA(jconst_ycc_rgb_convert_avx2) EXTN(jconst_ycc_rgb_convert_avx2): diff --git a/simd/i386/jdcolor-mmx.asm b/simd/i386/jdcolor-mmx.asm index 5136fe6..3a06417 100644 --- a/simd/i386/jdcolor-mmx.asm +++ b/simd/i386/jdcolor-mmx.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_ycc_rgb_convert_mmx) + GLOBAL_DATA(jconst_ycc_rgb_convert_mmx) EXTN(jconst_ycc_rgb_convert_mmx): diff --git a/simd/i386/jdcolor-sse2.asm b/simd/i386/jdcolor-sse2.asm index 5552dca..fd285d3 100644 --- a/simd/i386/jdcolor-sse2.asm +++ b/simd/i386/jdcolor-sse2.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_ycc_rgb_convert_sse2) + GLOBAL_DATA(jconst_ycc_rgb_convert_sse2) EXTN(jconst_ycc_rgb_convert_sse2): diff --git a/simd/i386/jdmerge-avx2.asm b/simd/i386/jdmerge-avx2.asm index b194bb7..3b3c883 100644 --- a/simd/i386/jdmerge-avx2.asm +++ b/simd/i386/jdmerge-avx2.asm @@ -35,7 +35,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_merged_upsample_avx2) + GLOBAL_DATA(jconst_merged_upsample_avx2) EXTN(jconst_merged_upsample_avx2): diff --git a/simd/i386/jdmerge-mmx.asm b/simd/i386/jdmerge-mmx.asm index 7ce1d86..82a3d7d 100644 --- a/simd/i386/jdmerge-mmx.asm +++ b/simd/i386/jdmerge-mmx.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_merged_upsample_mmx) + GLOBAL_DATA(jconst_merged_upsample_mmx) EXTN(jconst_merged_upsample_mmx): diff --git a/simd/i386/jdmerge-sse2.asm b/simd/i386/jdmerge-sse2.asm index fc1d6ad..d8299fd 100644 --- a/simd/i386/jdmerge-sse2.asm +++ b/simd/i386/jdmerge-sse2.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_merged_upsample_sse2) + GLOBAL_DATA(jconst_merged_upsample_sse2) EXTN(jconst_merged_upsample_sse2): diff --git a/simd/i386/jdmrgext-avx2.asm b/simd/i386/jdmrgext-avx2.asm index 5f2b567..87d5f4c 100644 --- a/simd/i386/jdmrgext-avx2.asm +++ b/simd/i386/jdmrgext-avx2.asm @@ -41,7 +41,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_h2v1_merged_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_avx2) EXTN(jsimd_h2v1_merged_upsample_avx2): push ebp @@ -521,7 +521,7 @@ EXTN(jsimd_h2v1_merged_upsample_avx2): %define output_buf(b) (b)+20 ; JSAMPARRAY output_buf align 32 - global EXTN(jsimd_h2v2_merged_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_avx2) EXTN(jsimd_h2v2_merged_upsample_avx2): push ebp diff --git a/simd/i386/jdmrgext-mmx.asm b/simd/i386/jdmrgext-mmx.asm index 0444632..9211a66 100644 --- a/simd/i386/jdmrgext-mmx.asm +++ b/simd/i386/jdmrgext-mmx.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_h2v1_merged_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_mmx) EXTN(jsimd_h2v1_merged_upsample_mmx): push ebp @@ -409,7 +409,7 @@ EXTN(jsimd_h2v1_merged_upsample_mmx): %define output_buf(b) (b)+20 ; JSAMPARRAY output_buf align 32 - global EXTN(jsimd_h2v2_merged_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_mmx) EXTN(jsimd_h2v2_merged_upsample_mmx): push ebp diff --git a/simd/i386/jdmrgext-sse2.asm b/simd/i386/jdmrgext-sse2.asm index 50702c6..b91be0c 100644 --- a/simd/i386/jdmrgext-sse2.asm +++ b/simd/i386/jdmrgext-sse2.asm @@ -40,7 +40,7 @@ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr align 32 - global EXTN(jsimd_h2v1_merged_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_sse2) EXTN(jsimd_h2v1_merged_upsample_sse2): push ebp @@ -463,7 +463,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2): %define output_buf(b) (b)+20 ; JSAMPARRAY output_buf align 32 - global EXTN(jsimd_h2v2_merged_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_sse2) EXTN(jsimd_h2v2_merged_upsample_sse2): push ebp diff --git a/simd/i386/jdsample-avx2.asm b/simd/i386/jdsample-avx2.asm index d087e3d..2f1d46e 100644 --- a/simd/i386/jdsample-avx2.asm +++ b/simd/i386/jdsample-avx2.asm @@ -23,7 +23,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fancy_upsample_avx2) + GLOBAL_DATA(jconst_fancy_upsample_avx2) EXTN(jconst_fancy_upsample_avx2): @@ -59,7 +59,7 @@ PW_EIGHT times 16 dw 8 %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_fancy_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_fancy_upsample_avx2) EXTN(jsimd_h2v1_fancy_upsample_avx2): push ebp @@ -225,7 +225,7 @@ EXTN(jsimd_h2v1_fancy_upsample_avx2): %define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr align 32 - global EXTN(jsimd_h2v2_fancy_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_fancy_upsample_avx2) EXTN(jsimd_h2v2_fancy_upsample_avx2): push ebp @@ -570,7 +570,7 @@ EXTN(jsimd_h2v2_fancy_upsample_avx2): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_upsample_avx2) EXTN(jsimd_h2v1_upsample_avx2): push ebp @@ -671,7 +671,7 @@ EXTN(jsimd_h2v1_upsample_avx2): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v2_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_upsample_avx2) EXTN(jsimd_h2v2_upsample_avx2): push ebp diff --git a/simd/i386/jdsample-mmx.asm b/simd/i386/jdsample-mmx.asm index 266ee7a..025d179 100644 --- a/simd/i386/jdsample-mmx.asm +++ b/simd/i386/jdsample-mmx.asm @@ -22,7 +22,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fancy_upsample_mmx) + GLOBAL_DATA(jconst_fancy_upsample_mmx) EXTN(jconst_fancy_upsample_mmx): @@ -58,7 +58,7 @@ PW_EIGHT times 4 dw 8 %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_fancy_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v1_fancy_upsample_mmx) EXTN(jsimd_h2v1_fancy_upsample_mmx): push ebp @@ -216,7 +216,7 @@ EXTN(jsimd_h2v1_fancy_upsample_mmx): %define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr align 32 - global EXTN(jsimd_h2v2_fancy_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v2_fancy_upsample_mmx) EXTN(jsimd_h2v2_fancy_upsample_mmx): push ebp @@ -542,7 +542,7 @@ EXTN(jsimd_h2v2_fancy_upsample_mmx): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v1_upsample_mmx) EXTN(jsimd_h2v1_upsample_mmx): push ebp @@ -643,7 +643,7 @@ EXTN(jsimd_h2v1_upsample_mmx): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v2_upsample_mmx) + GLOBAL_FUNCTION(jsimd_h2v2_upsample_mmx) EXTN(jsimd_h2v2_upsample_mmx): push ebp diff --git a/simd/i386/jdsample-sse2.asm b/simd/i386/jdsample-sse2.asm index 01d96b7..1980f74 100644 --- a/simd/i386/jdsample-sse2.asm +++ b/simd/i386/jdsample-sse2.asm @@ -22,7 +22,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fancy_upsample_sse2) + GLOBAL_DATA(jconst_fancy_upsample_sse2) EXTN(jconst_fancy_upsample_sse2): @@ -58,7 +58,7 @@ PW_EIGHT times 8 dw 8 %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_fancy_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_fancy_upsample_sse2) EXTN(jsimd_h2v1_fancy_upsample_sse2): push ebp @@ -214,7 +214,7 @@ EXTN(jsimd_h2v1_fancy_upsample_sse2): %define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr align 32 - global EXTN(jsimd_h2v2_fancy_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_fancy_upsample_sse2) EXTN(jsimd_h2v2_fancy_upsample_sse2): push ebp @@ -538,7 +538,7 @@ EXTN(jsimd_h2v2_fancy_upsample_sse2): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_upsample_sse2) EXTN(jsimd_h2v1_upsample_sse2): push ebp @@ -637,7 +637,7 @@ EXTN(jsimd_h2v1_upsample_sse2): %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v2_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_upsample_sse2) EXTN(jsimd_h2v2_upsample_sse2): push ebp diff --git a/simd/i386/jfdctflt-3dn.asm b/simd/i386/jfdctflt-3dn.asm index c3d8fba..a18acb0 100644 --- a/simd/i386/jfdctflt-3dn.asm +++ b/simd/i386/jfdctflt-3dn.asm @@ -27,7 +27,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_float_3dnow) + GLOBAL_DATA(jconst_fdct_float_3dnow) EXTN(jconst_fdct_float_3dnow): @@ -55,7 +55,7 @@ PD_1_306 times 2 dd 1.306562964876376527856643 %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_float_3dnow) + GLOBAL_FUNCTION(jsimd_fdct_float_3dnow) EXTN(jsimd_fdct_float_3dnow): push ebp diff --git a/simd/i386/jfdctflt-sse.asm b/simd/i386/jfdctflt-sse.asm index b15eb5c..b1dce30 100644 --- a/simd/i386/jfdctflt-sse.asm +++ b/simd/i386/jfdctflt-sse.asm @@ -37,7 +37,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_float_sse) + GLOBAL_DATA(jconst_fdct_float_sse) EXTN(jconst_fdct_float_sse): @@ -65,7 +65,7 @@ PD_1_306 times 4 dd 1.306562964876376527856643 %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_float_sse) + GLOBAL_FUNCTION(jsimd_fdct_float_sse) EXTN(jsimd_fdct_float_sse): push ebp diff --git a/simd/i386/jfdctfst-mmx.asm b/simd/i386/jfdctfst-mmx.asm index f274924..46478a8 100644 --- a/simd/i386/jfdctfst-mmx.asm +++ b/simd/i386/jfdctfst-mmx.asm @@ -52,7 +52,7 @@ F_1_306 equ DESCALE(1402911301,30-CONST_BITS) ; FIX(1.306562965) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_fdct_ifast_mmx) + GLOBAL_DATA(jconst_fdct_ifast_mmx) EXTN(jconst_fdct_ifast_mmx): @@ -80,7 +80,7 @@ PW_F1306 times 4 dw F_1_306 << CONST_SHIFT %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_ifast_mmx) + GLOBAL_FUNCTION(jsimd_fdct_ifast_mmx) EXTN(jsimd_fdct_ifast_mmx): push ebp diff --git a/simd/i386/jfdctfst-sse2.asm b/simd/i386/jfdctfst-sse2.asm index fb140fa..8a3d9ad 100644 --- a/simd/i386/jfdctfst-sse2.asm +++ b/simd/i386/jfdctfst-sse2.asm @@ -52,7 +52,7 @@ F_1_306 equ DESCALE(1402911301, 30-CONST_BITS) ; FIX(1.306562965) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_fdct_ifast_sse2) + GLOBAL_DATA(jconst_fdct_ifast_sse2) EXTN(jconst_fdct_ifast_sse2): @@ -80,7 +80,7 @@ PW_F1306 times 8 dw F_1_306 << CONST_SHIFT %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_ifast_sse2) + GLOBAL_FUNCTION(jsimd_fdct_ifast_sse2) EXTN(jsimd_fdct_ifast_sse2): push ebp diff --git a/simd/i386/jfdctint-avx2.asm b/simd/i386/jfdctint-avx2.asm index 4d8c7c6..38e4baa 100644 --- a/simd/i386/jfdctint-avx2.asm +++ b/simd/i386/jfdctint-avx2.asm @@ -226,7 +226,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_islow_avx2) + GLOBAL_DATA(jconst_fdct_islow_avx2) EXTN(jconst_fdct_islow_avx2): @@ -259,7 +259,7 @@ PW_1_NEG1 times 8 dw 1 %define data(b) (b)+8 ; DCTELEM *data align 32 - global EXTN(jsimd_fdct_islow_avx2) + GLOBAL_FUNCTION(jsimd_fdct_islow_avx2) EXTN(jsimd_fdct_islow_avx2): push ebp diff --git a/simd/i386/jfdctint-mmx.asm b/simd/i386/jfdctint-mmx.asm index c035b0c..ba50726 100644 --- a/simd/i386/jfdctint-mmx.asm +++ b/simd/i386/jfdctint-mmx.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341,30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_islow_mmx) + GLOBAL_DATA(jconst_fdct_islow_mmx) EXTN(jconst_fdct_islow_mmx): @@ -101,7 +101,7 @@ PW_DESCALE_P2X times 4 dw 1 << (PASS1_BITS-1) %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_islow_mmx) + GLOBAL_FUNCTION(jsimd_fdct_islow_mmx) EXTN(jsimd_fdct_islow_mmx): push ebp diff --git a/simd/i386/jfdctint-sse2.asm b/simd/i386/jfdctint-sse2.asm index 66f2cc6..c9dc2c6 100644 --- a/simd/i386/jfdctint-sse2.asm +++ b/simd/i386/jfdctint-sse2.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_islow_sse2) + GLOBAL_DATA(jconst_fdct_islow_sse2) EXTN(jconst_fdct_islow_sse2): @@ -101,7 +101,7 @@ PW_DESCALE_P2X times 8 dw 1 << (PASS1_BITS-1) %define WK_NUM 6 align 32 - global EXTN(jsimd_fdct_islow_sse2) + GLOBAL_FUNCTION(jsimd_fdct_islow_sse2) EXTN(jsimd_fdct_islow_sse2): push ebp diff --git a/simd/i386/jidctflt-3dn.asm b/simd/i386/jidctflt-3dn.asm index 1e47cf1..bf246a5 100644 --- a/simd/i386/jidctflt-3dn.asm +++ b/simd/i386/jidctflt-3dn.asm @@ -27,7 +27,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_float_3dnow) + GLOBAL_DATA(jconst_idct_float_3dnow) EXTN(jconst_idct_float_3dnow): @@ -63,7 +63,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE ; FAST_FLOAT workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_float_3dnow) + GLOBAL_FUNCTION(jsimd_idct_float_3dnow) EXTN(jsimd_idct_float_3dnow): push ebp diff --git a/simd/i386/jidctflt-sse.asm b/simd/i386/jidctflt-sse.asm index a1c99e9..dcec985 100644 --- a/simd/i386/jidctflt-sse.asm +++ b/simd/i386/jidctflt-sse.asm @@ -37,7 +37,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_float_sse) + GLOBAL_DATA(jconst_idct_float_sse) EXTN(jconst_idct_float_sse): @@ -73,7 +73,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE ; FAST_FLOAT workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_float_sse) + GLOBAL_FUNCTION(jsimd_idct_float_sse) EXTN(jsimd_idct_float_sse): push ebp diff --git a/simd/i386/jidctflt-sse2.asm b/simd/i386/jidctflt-sse2.asm index e8be844..25e65ef 100644 --- a/simd/i386/jidctflt-sse2.asm +++ b/simd/i386/jidctflt-sse2.asm @@ -37,7 +37,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_float_sse2) + GLOBAL_DATA(jconst_idct_float_sse2) EXTN(jconst_idct_float_sse2): @@ -73,7 +73,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE ; FAST_FLOAT workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_float_sse2) + GLOBAL_FUNCTION(jsimd_idct_float_sse2) EXTN(jsimd_idct_float_sse2): push ebp diff --git a/simd/i386/jidctfst-mmx.asm b/simd/i386/jidctfst-mmx.asm index 7b5c2f2..b9a560f 100644 --- a/simd/i386/jidctfst-mmx.asm +++ b/simd/i386/jidctfst-mmx.asm @@ -59,7 +59,7 @@ F_1_613 equ (F_2_613 - (1 << CONST_BITS)) ; FIX(2.613125930) - FIX(1) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_idct_ifast_mmx) + GLOBAL_DATA(jconst_idct_ifast_mmx) EXTN(jconst_idct_ifast_mmx): @@ -94,7 +94,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE ; JCOEF workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_ifast_mmx) + GLOBAL_FUNCTION(jsimd_idct_ifast_mmx) EXTN(jsimd_idct_ifast_mmx): push ebp diff --git a/simd/i386/jidctfst-sse2.asm b/simd/i386/jidctfst-sse2.asm index 51e3317..2503255 100644 --- a/simd/i386/jidctfst-sse2.asm +++ b/simd/i386/jidctfst-sse2.asm @@ -59,7 +59,7 @@ F_1_613 equ (F_2_613 - (1 << CONST_BITS)) ; FIX(2.613125930) - FIX(1) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_idct_ifast_sse2) + GLOBAL_DATA(jconst_idct_ifast_sse2) EXTN(jconst_idct_ifast_sse2): @@ -92,7 +92,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 2 align 32 - global EXTN(jsimd_idct_ifast_sse2) + GLOBAL_FUNCTION(jsimd_idct_ifast_sse2) EXTN(jsimd_idct_ifast_sse2): push ebp diff --git a/simd/i386/jidctint-avx2.asm b/simd/i386/jidctint-avx2.asm index 435f69a..6c37009 100644 --- a/simd/i386/jidctint-avx2.asm +++ b/simd/i386/jidctint-avx2.asm @@ -253,7 +253,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_islow_avx2) + GLOBAL_DATA(jconst_idct_islow_avx2) EXTN(jconst_idct_islow_avx2): @@ -294,7 +294,7 @@ PW_1_NEG1 times 8 dw 1 %define WK_NUM 4 align 32 - global EXTN(jsimd_idct_islow_avx2) + GLOBAL_FUNCTION(jsimd_idct_islow_avx2) EXTN(jsimd_idct_islow_avx2): push ebp diff --git a/simd/i386/jidctint-mmx.asm b/simd/i386/jidctint-mmx.asm index 6ef7ff7..d013366 100644 --- a/simd/i386/jidctint-mmx.asm +++ b/simd/i386/jidctint-mmx.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341,30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_islow_mmx) + GLOBAL_DATA(jconst_idct_islow_mmx) EXTN(jconst_idct_islow_mmx): @@ -107,7 +107,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE ; JCOEF workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_islow_mmx) + GLOBAL_FUNCTION(jsimd_idct_islow_mmx) EXTN(jsimd_idct_islow_mmx): push ebp diff --git a/simd/i386/jidctint-sse2.asm b/simd/i386/jidctint-sse2.asm index 441da70..c681b35 100644 --- a/simd/i386/jidctint-sse2.asm +++ b/simd/i386/jidctint-sse2.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_islow_sse2) + GLOBAL_DATA(jconst_idct_islow_sse2) EXTN(jconst_idct_islow_sse2): @@ -105,7 +105,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 12 align 32 - global EXTN(jsimd_idct_islow_sse2) + GLOBAL_FUNCTION(jsimd_idct_islow_sse2) EXTN(jsimd_idct_islow_sse2): push ebp diff --git a/simd/i386/jidctred-mmx.asm b/simd/i386/jidctred-mmx.asm index d5b7e2e..f3e3c88 100644 --- a/simd/i386/jidctred-mmx.asm +++ b/simd/i386/jidctred-mmx.asm @@ -72,7 +72,7 @@ F_3_624 equ DESCALE(3891787747,30-CONST_BITS) ; FIX(3.624509785) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_red_mmx) + GLOBAL_DATA(jconst_idct_red_mmx) EXTN(jconst_idct_red_mmx): @@ -115,7 +115,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE ; JCOEF workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_4x4_mmx) + GLOBAL_FUNCTION(jsimd_idct_4x4_mmx) EXTN(jsimd_idct_4x4_mmx): push ebp @@ -503,7 +503,7 @@ EXTN(jsimd_idct_4x4_mmx): %define output_col(b) (b)+20 ; JDIMENSION output_col align 32 - global EXTN(jsimd_idct_2x2_mmx) + GLOBAL_FUNCTION(jsimd_idct_2x2_mmx) EXTN(jsimd_idct_2x2_mmx): push ebp diff --git a/simd/i386/jidctred-sse2.asm b/simd/i386/jidctred-sse2.asm index d0609ac..566c753 100644 --- a/simd/i386/jidctred-sse2.asm +++ b/simd/i386/jidctred-sse2.asm @@ -72,7 +72,7 @@ F_3_624 equ DESCALE(3891787747, 30-CONST_BITS) ; FIX(3.624509785) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_red_sse2) + GLOBAL_DATA(jconst_idct_red_sse2) EXTN(jconst_idct_red_sse2): @@ -113,7 +113,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 2 align 32 - global EXTN(jsimd_idct_4x4_sse2) + GLOBAL_FUNCTION(jsimd_idct_4x4_sse2) EXTN(jsimd_idct_4x4_sse2): push ebp @@ -424,7 +424,7 @@ EXTN(jsimd_idct_4x4_sse2): %define output_col(b) (b)+20 ; JDIMENSION output_col align 32 - global EXTN(jsimd_idct_2x2_sse2) + GLOBAL_FUNCTION(jsimd_idct_2x2_sse2) EXTN(jsimd_idct_2x2_sse2): push ebp diff --git a/simd/i386/jquant-3dn.asm b/simd/i386/jquant-3dn.asm index 73c02cd..dbf54e4 100644 --- a/simd/i386/jquant-3dn.asm +++ b/simd/i386/jquant-3dn.asm @@ -35,7 +35,7 @@ %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_convsamp_float_3dnow) + GLOBAL_FUNCTION(jsimd_convsamp_float_3dnow) EXTN(jsimd_convsamp_float_3dnow): push ebp @@ -138,7 +138,7 @@ EXTN(jsimd_convsamp_float_3dnow): %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_quantize_float_3dnow) + GLOBAL_FUNCTION(jsimd_quantize_float_3dnow) EXTN(jsimd_quantize_float_3dnow): push ebp diff --git a/simd/i386/jquant-mmx.asm b/simd/i386/jquant-mmx.asm index 93dea31..7959224 100644 --- a/simd/i386/jquant-mmx.asm +++ b/simd/i386/jquant-mmx.asm @@ -35,7 +35,7 @@ %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_convsamp_mmx) + GLOBAL_FUNCTION(jsimd_convsamp_mmx) EXTN(jsimd_convsamp_mmx): push ebp @@ -140,7 +140,7 @@ EXTN(jsimd_convsamp_mmx): %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_quantize_mmx) + GLOBAL_FUNCTION(jsimd_quantize_mmx) EXTN(jsimd_quantize_mmx): push ebp diff --git a/simd/i386/jquant-sse.asm b/simd/i386/jquant-sse.asm index d6ab943..ea7d6d5 100644 --- a/simd/i386/jquant-sse.asm +++ b/simd/i386/jquant-sse.asm @@ -35,7 +35,7 @@ %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_convsamp_float_sse) + GLOBAL_FUNCTION(jsimd_convsamp_float_sse) EXTN(jsimd_convsamp_float_sse): push ebp @@ -138,7 +138,7 @@ EXTN(jsimd_convsamp_float_sse): %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_quantize_float_sse) + GLOBAL_FUNCTION(jsimd_quantize_float_sse) EXTN(jsimd_quantize_float_sse): push ebp diff --git a/simd/i386/jquantf-sse2.asm b/simd/i386/jquantf-sse2.asm index 3c0000e..5512344 100644 --- a/simd/i386/jquantf-sse2.asm +++ b/simd/i386/jquantf-sse2.asm @@ -35,7 +35,7 @@ %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_convsamp_float_sse2) + GLOBAL_FUNCTION(jsimd_convsamp_float_sse2) EXTN(jsimd_convsamp_float_sse2): push ebp @@ -115,7 +115,7 @@ EXTN(jsimd_convsamp_float_sse2): %define workspace ebp+16 ; FAST_FLOAT *workspace align 32 - global EXTN(jsimd_quantize_float_sse2) + GLOBAL_FUNCTION(jsimd_quantize_float_sse2) EXTN(jsimd_quantize_float_sse2): push ebp diff --git a/simd/i386/jquanti-avx2.asm b/simd/i386/jquanti-avx2.asm index 456d86e..5340531 100644 --- a/simd/i386/jquanti-avx2.asm +++ b/simd/i386/jquanti-avx2.asm @@ -36,7 +36,7 @@ %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_convsamp_avx2) + GLOBAL_FUNCTION(jsimd_convsamp_avx2) EXTN(jsimd_convsamp_avx2): push ebp @@ -126,7 +126,7 @@ EXTN(jsimd_convsamp_avx2): %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_quantize_avx2) + GLOBAL_FUNCTION(jsimd_quantize_avx2) EXTN(jsimd_quantize_avx2): push ebp diff --git a/simd/i386/jquanti-sse2.asm b/simd/i386/jquanti-sse2.asm index 6f42947..99e9d4c 100644 --- a/simd/i386/jquanti-sse2.asm +++ b/simd/i386/jquanti-sse2.asm @@ -35,7 +35,7 @@ %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_convsamp_sse2) + GLOBAL_FUNCTION(jsimd_convsamp_sse2) EXTN(jsimd_convsamp_sse2): push ebp @@ -117,7 +117,7 @@ EXTN(jsimd_convsamp_sse2): %define workspace ebp+16 ; DCTELEM *workspace align 32 - global EXTN(jsimd_quantize_sse2) + GLOBAL_FUNCTION(jsimd_quantize_sse2) EXTN(jsimd_quantize_sse2): push ebp diff --git a/simd/i386/jsimdcpu.asm b/simd/i386/jsimdcpu.asm index 827aefe..4c5e4b6 100644 --- a/simd/i386/jsimdcpu.asm +++ b/simd/i386/jsimdcpu.asm @@ -29,7 +29,7 @@ ; align 32 - global EXTN(jpeg_simd_cpu_support) + GLOBAL_FUNCTION(jpeg_simd_cpu_support) EXTN(jpeg_simd_cpu_support): push ebx diff --git a/simd/nasm/jsimdext.inc b/simd/nasm/jsimdext.inc index 3485d6d..5cb26ca 100644 --- a/simd/nasm/jsimdext.inc +++ b/simd/nasm/jsimdext.inc @@ -3,6 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2010, 2016, D. R. Commander. +; Copyright (C) 2018, Matthieu Darbois. ; ; Based on the x86 SIMD extension for IJG JPEG library - version 1.02 ; @@ -187,6 +188,20 @@ section .note.GNU-stack noalloc noexec nowrite progbits %define EXTN(name) _ %+ name ; foo() -> _foo %endif +; -------------------------------------------------------------------------- +; Hidden symbols +; +%ifdef ELF ; ----(nasm -felf[64] -DELF ...)-------- +%define GLOBAL_FUNCTION(name) global EXTN(name):function hidden +%define GLOBAL_DATA(name) global EXTN(name):data hidden +;%elifdef MACHO ; ----(nasm -fmacho -DMACHO ...)-------- +;%define GLOBAL_FUNCTION(name) global EXTN(name):private_extern +;%define GLOBAL_DATA(name) global EXTN(name):private_extern +%else +%define GLOBAL_FUNCTION(name) global EXTN(name) +%define GLOBAL_DATA(name) global EXTN(name) +%endif + ; -------------------------------------------------------------------------- ; Macros for position-independent code (PIC) support ; diff --git a/simd/x86_64/jccolext-avx2.asm b/simd/x86_64/jccolext-avx2.asm index a7e977a..745cb2d 100644 --- a/simd/x86_64/jccolext-avx2.asm +++ b/simd/x86_64/jccolext-avx2.asm @@ -39,7 +39,7 @@ align 32 - global EXTN(jsimd_rgb_ycc_convert_avx2) + GLOBAL_FUNCTION(jsimd_rgb_ycc_convert_avx2) EXTN(jsimd_rgb_ycc_convert_avx2): push rbp diff --git a/simd/x86_64/jccolext-sse2.asm b/simd/x86_64/jccolext-sse2.asm index 8fe072d..695ab59 100644 --- a/simd/x86_64/jccolext-sse2.asm +++ b/simd/x86_64/jccolext-sse2.asm @@ -38,7 +38,7 @@ align 32 - global EXTN(jsimd_rgb_ycc_convert_sse2) + GLOBAL_FUNCTION(jsimd_rgb_ycc_convert_sse2) EXTN(jsimd_rgb_ycc_convert_sse2): push rbp diff --git a/simd/x86_64/jccolor-avx2.asm b/simd/x86_64/jccolor-avx2.asm index 805c03d..78665ec 100644 --- a/simd/x86_64/jccolor-avx2.asm +++ b/simd/x86_64/jccolor-avx2.asm @@ -36,7 +36,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_ycc_convert_avx2) + GLOBAL_DATA(jconst_rgb_ycc_convert_avx2) EXTN(jconst_rgb_ycc_convert_avx2): diff --git a/simd/x86_64/jccolor-sse2.asm b/simd/x86_64/jccolor-sse2.asm index c2179db..6c8813b 100644 --- a/simd/x86_64/jccolor-sse2.asm +++ b/simd/x86_64/jccolor-sse2.asm @@ -35,7 +35,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_ycc_convert_sse2) + GLOBAL_DATA(jconst_rgb_ycc_convert_sse2) EXTN(jconst_rgb_ycc_convert_sse2): diff --git a/simd/x86_64/jcgray-avx2.asm b/simd/x86_64/jcgray-avx2.asm index e6ea21e..e7cdbc3 100644 --- a/simd/x86_64/jcgray-avx2.asm +++ b/simd/x86_64/jcgray-avx2.asm @@ -32,7 +32,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_gray_convert_avx2) + GLOBAL_DATA(jconst_rgb_gray_convert_avx2) EXTN(jconst_rgb_gray_convert_avx2): diff --git a/simd/x86_64/jcgray-sse2.asm b/simd/x86_64/jcgray-sse2.asm index 7cb9819..fbf3b12 100644 --- a/simd/x86_64/jcgray-sse2.asm +++ b/simd/x86_64/jcgray-sse2.asm @@ -31,7 +31,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000) SECTION SEG_CONST alignz 32 - global EXTN(jconst_rgb_gray_convert_sse2) + GLOBAL_DATA(jconst_rgb_gray_convert_sse2) EXTN(jconst_rgb_gray_convert_sse2): diff --git a/simd/x86_64/jcgryext-avx2.asm b/simd/x86_64/jcgryext-avx2.asm index 8824a45..da5359b 100644 --- a/simd/x86_64/jcgryext-avx2.asm +++ b/simd/x86_64/jcgryext-avx2.asm @@ -39,7 +39,7 @@ align 32 - global EXTN(jsimd_rgb_gray_convert_avx2) + GLOBAL_FUNCTION(jsimd_rgb_gray_convert_avx2) EXTN(jsimd_rgb_gray_convert_avx2): push rbp diff --git a/simd/x86_64/jcgryext-sse2.asm b/simd/x86_64/jcgryext-sse2.asm index d26ada3..b8a4c64 100644 --- a/simd/x86_64/jcgryext-sse2.asm +++ b/simd/x86_64/jcgryext-sse2.asm @@ -38,7 +38,7 @@ align 32 - global EXTN(jsimd_rgb_gray_convert_sse2) + GLOBAL_FUNCTION(jsimd_rgb_gray_convert_sse2) EXTN(jsimd_rgb_gray_convert_sse2): push rbp diff --git a/simd/x86_64/jchuff-sse2.asm b/simd/x86_64/jchuff-sse2.asm index bedc639..1fcd390 100644 --- a/simd/x86_64/jchuff-sse2.asm +++ b/simd/x86_64/jchuff-sse2.asm @@ -26,7 +26,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_huff_encode_one_block) + GLOBAL_DATA(jconst_huff_encode_one_block) EXTN(jconst_huff_encode_one_block): @@ -183,7 +183,7 @@ EXTN(jconst_huff_encode_one_block): %define buffer rax align 32 - global EXTN(jsimd_huff_encode_one_block_sse2) + GLOBAL_FUNCTION(jsimd_huff_encode_one_block_sse2) EXTN(jsimd_huff_encode_one_block_sse2): push rbp diff --git a/simd/x86_64/jcsample-avx2.asm b/simd/x86_64/jcsample-avx2.asm index d7877ea..29f4177 100644 --- a/simd/x86_64/jcsample-avx2.asm +++ b/simd/x86_64/jcsample-avx2.asm @@ -41,7 +41,7 @@ ; r15 = JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v1_downsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_downsample_avx2) EXTN(jsimd_h2v1_downsample_avx2): push rbp @@ -202,7 +202,7 @@ EXTN(jsimd_h2v1_downsample_avx2): ; r15 = JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v2_downsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_downsample_avx2) EXTN(jsimd_h2v2_downsample_avx2): push rbp diff --git a/simd/x86_64/jcsample-sse2.asm b/simd/x86_64/jcsample-sse2.asm index 2e5d3f5..aca8bdb 100644 --- a/simd/x86_64/jcsample-sse2.asm +++ b/simd/x86_64/jcsample-sse2.asm @@ -40,7 +40,7 @@ ; r15 = JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v1_downsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_downsample_sse2) EXTN(jsimd_h2v1_downsample_sse2): push rbp @@ -184,7 +184,7 @@ EXTN(jsimd_h2v1_downsample_sse2): ; r15 = JSAMPARRAY output_data align 32 - global EXTN(jsimd_h2v2_downsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_downsample_sse2) EXTN(jsimd_h2v2_downsample_sse2): push rbp diff --git a/simd/x86_64/jdcolext-avx2.asm b/simd/x86_64/jdcolext-avx2.asm index ca81ad8..eba95c2 100644 --- a/simd/x86_64/jdcolext-avx2.asm +++ b/simd/x86_64/jdcolext-avx2.asm @@ -39,7 +39,7 @@ %define WK_NUM 2 align 32 - global EXTN(jsimd_ycc_rgb_convert_avx2) + GLOBAL_FUNCTION(jsimd_ycc_rgb_convert_avx2) EXTN(jsimd_ycc_rgb_convert_avx2): push rbp diff --git a/simd/x86_64/jdcolext-sse2.asm b/simd/x86_64/jdcolext-sse2.asm index f49709f..bbe53fd 100644 --- a/simd/x86_64/jdcolext-sse2.asm +++ b/simd/x86_64/jdcolext-sse2.asm @@ -38,7 +38,7 @@ %define WK_NUM 2 align 32 - global EXTN(jsimd_ycc_rgb_convert_sse2) + GLOBAL_FUNCTION(jsimd_ycc_rgb_convert_sse2) EXTN(jsimd_ycc_rgb_convert_sse2): push rbp diff --git a/simd/x86_64/jdcolor-avx2.asm b/simd/x86_64/jdcolor-avx2.asm index dd878a9..7a83d67 100644 --- a/simd/x86_64/jdcolor-avx2.asm +++ b/simd/x86_64/jdcolor-avx2.asm @@ -35,7 +35,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_ycc_rgb_convert_avx2) + GLOBAL_DATA(jconst_ycc_rgb_convert_avx2) EXTN(jconst_ycc_rgb_convert_avx2): diff --git a/simd/x86_64/jdcolor-sse2.asm b/simd/x86_64/jdcolor-sse2.asm index 55e10a4..e6b7dd1 100644 --- a/simd/x86_64/jdcolor-sse2.asm +++ b/simd/x86_64/jdcolor-sse2.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_ycc_rgb_convert_sse2) + GLOBAL_DATA(jconst_ycc_rgb_convert_sse2) EXTN(jconst_ycc_rgb_convert_sse2): diff --git a/simd/x86_64/jdmerge-avx2.asm b/simd/x86_64/jdmerge-avx2.asm index fa3a321..7209cbb 100644 --- a/simd/x86_64/jdmerge-avx2.asm +++ b/simd/x86_64/jdmerge-avx2.asm @@ -35,7 +35,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_merged_upsample_avx2) + GLOBAL_DATA(jconst_merged_upsample_avx2) EXTN(jconst_merged_upsample_avx2): diff --git a/simd/x86_64/jdmerge-sse2.asm b/simd/x86_64/jdmerge-sse2.asm index a488916..45a737b 100644 --- a/simd/x86_64/jdmerge-sse2.asm +++ b/simd/x86_64/jdmerge-sse2.asm @@ -34,7 +34,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200) SECTION SEG_CONST alignz 32 - global EXTN(jconst_merged_upsample_sse2) + GLOBAL_DATA(jconst_merged_upsample_sse2) EXTN(jconst_merged_upsample_sse2): diff --git a/simd/x86_64/jdmrgext-avx2.asm b/simd/x86_64/jdmrgext-avx2.asm index 546a9e5..a8b5197 100644 --- a/simd/x86_64/jdmrgext-avx2.asm +++ b/simd/x86_64/jdmrgext-avx2.asm @@ -39,7 +39,7 @@ %define WK_NUM 3 align 32 - global EXTN(jsimd_h2v1_merged_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_avx2) EXTN(jsimd_h2v1_merged_upsample_avx2): push rbp @@ -503,7 +503,7 @@ EXTN(jsimd_h2v1_merged_upsample_avx2): ; r13 = JSAMPARRAY output_buf align 32 - global EXTN(jsimd_h2v2_merged_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_avx2) EXTN(jsimd_h2v2_merged_upsample_avx2): push rbp diff --git a/simd/x86_64/jdmrgext-sse2.asm b/simd/x86_64/jdmrgext-sse2.asm index 4c2bb04..514ccda 100644 --- a/simd/x86_64/jdmrgext-sse2.asm +++ b/simd/x86_64/jdmrgext-sse2.asm @@ -38,7 +38,7 @@ %define WK_NUM 3 align 32 - global EXTN(jsimd_h2v1_merged_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_merged_upsample_sse2) EXTN(jsimd_h2v1_merged_upsample_sse2): push rbp @@ -445,7 +445,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2): ; r13 = JSAMPARRAY output_buf align 32 - global EXTN(jsimd_h2v2_merged_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_merged_upsample_sse2) EXTN(jsimd_h2v2_merged_upsample_sse2): push rbp diff --git a/simd/x86_64/jdsample-avx2.asm b/simd/x86_64/jdsample-avx2.asm index f3384ca..9260b78 100644 --- a/simd/x86_64/jdsample-avx2.asm +++ b/simd/x86_64/jdsample-avx2.asm @@ -23,7 +23,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fancy_upsample_avx2) + GLOBAL_DATA(jconst_fancy_upsample_avx2) EXTN(jconst_fancy_upsample_avx2): @@ -59,7 +59,7 @@ PW_EIGHT times 16 dw 8 ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_fancy_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_fancy_upsample_avx2) EXTN(jsimd_h2v1_fancy_upsample_avx2): push rbp @@ -213,7 +213,7 @@ EXTN(jsimd_h2v1_fancy_upsample_avx2): %define WK_NUM 4 align 32 - global EXTN(jsimd_h2v2_fancy_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_fancy_upsample_avx2) EXTN(jsimd_h2v2_fancy_upsample_avx2): push rbp @@ -524,7 +524,7 @@ EXTN(jsimd_h2v2_fancy_upsample_avx2): ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v1_upsample_avx2) EXTN(jsimd_h2v1_upsample_avx2): push rbp @@ -615,7 +615,7 @@ EXTN(jsimd_h2v1_upsample_avx2): ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v2_upsample_avx2) + GLOBAL_FUNCTION(jsimd_h2v2_upsample_avx2) EXTN(jsimd_h2v2_upsample_avx2): push rbp diff --git a/simd/x86_64/jdsample-sse2.asm b/simd/x86_64/jdsample-sse2.asm index 42a8e78..c2b6c21 100644 --- a/simd/x86_64/jdsample-sse2.asm +++ b/simd/x86_64/jdsample-sse2.asm @@ -22,7 +22,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fancy_upsample_sse2) + GLOBAL_DATA(jconst_fancy_upsample_sse2) EXTN(jconst_fancy_upsample_sse2): @@ -58,7 +58,7 @@ PW_EIGHT times 8 dw 8 ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_fancy_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_fancy_upsample_sse2) EXTN(jsimd_h2v1_fancy_upsample_sse2): push rbp @@ -200,7 +200,7 @@ EXTN(jsimd_h2v1_fancy_upsample_sse2): %define WK_NUM 4 align 32 - global EXTN(jsimd_h2v2_fancy_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_fancy_upsample_sse2) EXTN(jsimd_h2v2_fancy_upsample_sse2): push rbp @@ -497,7 +497,7 @@ EXTN(jsimd_h2v2_fancy_upsample_sse2): ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v1_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v1_upsample_sse2) EXTN(jsimd_h2v1_upsample_sse2): push rbp @@ -586,7 +586,7 @@ EXTN(jsimd_h2v1_upsample_sse2): ; r13 = JSAMPARRAY *output_data_ptr align 32 - global EXTN(jsimd_h2v2_upsample_sse2) + GLOBAL_FUNCTION(jsimd_h2v2_upsample_sse2) EXTN(jsimd_h2v2_upsample_sse2): push rbp diff --git a/simd/x86_64/jfdctflt-sse.asm b/simd/x86_64/jfdctflt-sse.asm index 127ef28..ef79ec5 100644 --- a/simd/x86_64/jfdctflt-sse.asm +++ b/simd/x86_64/jfdctflt-sse.asm @@ -37,7 +37,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_float_sse) + GLOBAL_DATA(jconst_fdct_float_sse) EXTN(jconst_fdct_float_sse): @@ -64,7 +64,7 @@ PD_1_306 times 4 dd 1.306562964876376527856643 %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_float_sse) + GLOBAL_FUNCTION(jsimd_fdct_float_sse) EXTN(jsimd_fdct_float_sse): push rbp diff --git a/simd/x86_64/jfdctfst-sse2.asm b/simd/x86_64/jfdctfst-sse2.asm index 479e5da..ef8da74 100644 --- a/simd/x86_64/jfdctfst-sse2.asm +++ b/simd/x86_64/jfdctfst-sse2.asm @@ -52,7 +52,7 @@ F_1_306 equ DESCALE(1402911301, 30-CONST_BITS) ; FIX(1.306562965) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_fdct_ifast_sse2) + GLOBAL_DATA(jconst_fdct_ifast_sse2) EXTN(jconst_fdct_ifast_sse2): @@ -79,7 +79,7 @@ PW_F1306 times 8 dw F_1_306 << CONST_SHIFT %define WK_NUM 2 align 32 - global EXTN(jsimd_fdct_ifast_sse2) + GLOBAL_FUNCTION(jsimd_fdct_ifast_sse2) EXTN(jsimd_fdct_ifast_sse2): push rbp diff --git a/simd/x86_64/jfdctint-avx2.asm b/simd/x86_64/jfdctint-avx2.asm index b3e2d0b..f6df504 100644 --- a/simd/x86_64/jfdctint-avx2.asm +++ b/simd/x86_64/jfdctint-avx2.asm @@ -226,7 +226,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_islow_avx2) + GLOBAL_DATA(jconst_fdct_islow_avx2) EXTN(jconst_fdct_islow_avx2): @@ -259,7 +259,7 @@ PW_1_NEG1 times 8 dw 1 ; r10 = DCTELEM *data align 32 - global EXTN(jsimd_fdct_islow_avx2) + GLOBAL_FUNCTION(jsimd_fdct_islow_avx2) EXTN(jsimd_fdct_islow_avx2): push rbp diff --git a/simd/x86_64/jfdctint-sse2.asm b/simd/x86_64/jfdctint-sse2.asm index cdaa56f..a112cb1 100644 --- a/simd/x86_64/jfdctint-sse2.asm +++ b/simd/x86_64/jfdctint-sse2.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_fdct_islow_sse2) + GLOBAL_DATA(jconst_fdct_islow_sse2) EXTN(jconst_fdct_islow_sse2): @@ -100,7 +100,7 @@ PW_DESCALE_P2X times 8 dw 1 << (PASS1_BITS-1) %define WK_NUM 6 align 32 - global EXTN(jsimd_fdct_islow_sse2) + GLOBAL_FUNCTION(jsimd_fdct_islow_sse2) EXTN(jsimd_fdct_islow_sse2): push rbp diff --git a/simd/x86_64/jidctflt-sse2.asm b/simd/x86_64/jidctflt-sse2.asm index 6f22339..153386a 100644 --- a/simd/x86_64/jidctflt-sse2.asm +++ b/simd/x86_64/jidctflt-sse2.asm @@ -37,7 +37,7 @@ SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_float_sse2) + GLOBAL_DATA(jconst_idct_float_sse2) EXTN(jconst_idct_float_sse2): @@ -73,7 +73,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE ; FAST_FLOAT workspace[DCTSIZE2] align 32 - global EXTN(jsimd_idct_float_sse2) + GLOBAL_FUNCTION(jsimd_idct_float_sse2) EXTN(jsimd_idct_float_sse2): push rbp diff --git a/simd/x86_64/jidctfst-sse2.asm b/simd/x86_64/jidctfst-sse2.asm index 422ad1b..3122a61 100644 --- a/simd/x86_64/jidctfst-sse2.asm +++ b/simd/x86_64/jidctfst-sse2.asm @@ -59,7 +59,7 @@ F_1_613 equ (F_2_613 - (1 << CONST_BITS)) ; FIX(2.613125930) - FIX(1) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) alignz 32 - global EXTN(jconst_idct_ifast_sse2) + GLOBAL_DATA(jconst_idct_ifast_sse2) EXTN(jconst_idct_ifast_sse2): @@ -92,7 +92,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 2 align 32 - global EXTN(jsimd_idct_ifast_sse2) + GLOBAL_FUNCTION(jsimd_idct_ifast_sse2) EXTN(jsimd_idct_ifast_sse2): push rbp diff --git a/simd/x86_64/jidctint-avx2.asm b/simd/x86_64/jidctint-avx2.asm index 3cbdc27..3287439 100644 --- a/simd/x86_64/jidctint-avx2.asm +++ b/simd/x86_64/jidctint-avx2.asm @@ -243,7 +243,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_islow_avx2) + GLOBAL_DATA(jconst_idct_islow_avx2) EXTN(jconst_idct_islow_avx2): @@ -280,7 +280,7 @@ PW_1_NEG1 times 8 dw 1 ; r13d = JDIMENSION output_col align 32 - global EXTN(jsimd_idct_islow_avx2) + GLOBAL_FUNCTION(jsimd_idct_islow_avx2) EXTN(jsimd_idct_islow_avx2): push rbp diff --git a/simd/x86_64/jidctint-sse2.asm b/simd/x86_64/jidctint-sse2.asm index 6487266..1f7d999 100644 --- a/simd/x86_64/jidctint-sse2.asm +++ b/simd/x86_64/jidctint-sse2.asm @@ -66,7 +66,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_islow_sse2) + GLOBAL_DATA(jconst_idct_islow_sse2) EXTN(jconst_idct_islow_sse2): @@ -105,7 +105,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 12 align 32 - global EXTN(jsimd_idct_islow_sse2) + GLOBAL_FUNCTION(jsimd_idct_islow_sse2) EXTN(jsimd_idct_islow_sse2): push rbp diff --git a/simd/x86_64/jidctred-sse2.asm b/simd/x86_64/jidctred-sse2.asm index 69b71f0..48aca07 100644 --- a/simd/x86_64/jidctred-sse2.asm +++ b/simd/x86_64/jidctred-sse2.asm @@ -72,7 +72,7 @@ F_3_624 equ DESCALE(3891787747, 30-CONST_BITS) ; FIX(3.624509785) SECTION SEG_CONST alignz 32 - global EXTN(jconst_idct_red_sse2) + GLOBAL_DATA(jconst_idct_red_sse2) EXTN(jconst_idct_red_sse2): @@ -113,7 +113,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE %define WK_NUM 2 align 32 - global EXTN(jsimd_idct_4x4_sse2) + GLOBAL_FUNCTION(jsimd_idct_4x4_sse2) EXTN(jsimd_idct_4x4_sse2): push rbp @@ -412,7 +412,7 @@ EXTN(jsimd_idct_4x4_sse2): ; r13d = JDIMENSION output_col align 32 - global EXTN(jsimd_idct_2x2_sse2) + GLOBAL_FUNCTION(jsimd_idct_2x2_sse2) EXTN(jsimd_idct_2x2_sse2): push rbp diff --git a/simd/x86_64/jquantf-sse2.asm b/simd/x86_64/jquantf-sse2.asm index 3699d44..6785e6a 100644 --- a/simd/x86_64/jquantf-sse2.asm +++ b/simd/x86_64/jquantf-sse2.asm @@ -35,7 +35,7 @@ ; r12 = FAST_FLOAT *workspace align 32 - global EXTN(jsimd_convsamp_float_sse2) + GLOBAL_FUNCTION(jsimd_convsamp_float_sse2) EXTN(jsimd_convsamp_float_sse2): push rbp @@ -109,7 +109,7 @@ EXTN(jsimd_convsamp_float_sse2): ; r12 = FAST_FLOAT *workspace align 32 - global EXTN(jsimd_quantize_float_sse2) + GLOBAL_FUNCTION(jsimd_quantize_float_sse2) EXTN(jsimd_quantize_float_sse2): push rbp diff --git a/simd/x86_64/jquanti-avx2.asm b/simd/x86_64/jquanti-avx2.asm index ec96da5..b287930 100644 --- a/simd/x86_64/jquanti-avx2.asm +++ b/simd/x86_64/jquanti-avx2.asm @@ -36,7 +36,7 @@ ; r12 = DCTELEM *workspace align 32 - global EXTN(jsimd_convsamp_avx2) + GLOBAL_FUNCTION(jsimd_convsamp_avx2) EXTN(jsimd_convsamp_avx2): push rbp @@ -111,7 +111,7 @@ EXTN(jsimd_convsamp_avx2): ; r12 = DCTELEM *workspace align 32 - global EXTN(jsimd_quantize_avx2) + GLOBAL_FUNCTION(jsimd_quantize_avx2) EXTN(jsimd_quantize_avx2): push rbp diff --git a/simd/x86_64/jquanti-sse2.asm b/simd/x86_64/jquanti-sse2.asm index 4b0873e..6732c31 100644 --- a/simd/x86_64/jquanti-sse2.asm +++ b/simd/x86_64/jquanti-sse2.asm @@ -35,7 +35,7 @@ ; r12 = DCTELEM *workspace align 32 - global EXTN(jsimd_convsamp_sse2) + GLOBAL_FUNCTION(jsimd_convsamp_sse2) EXTN(jsimd_convsamp_sse2): push rbp @@ -111,7 +111,7 @@ EXTN(jsimd_convsamp_sse2): ; r12 = DCTELEM *workspace align 32 - global EXTN(jsimd_quantize_sse2) + GLOBAL_FUNCTION(jsimd_quantize_sse2) EXTN(jsimd_quantize_sse2): push rbp diff --git a/simd/x86_64/jsimdcpu.asm b/simd/x86_64/jsimdcpu.asm index a1ebb85..4dbcc68 100644 --- a/simd/x86_64/jsimdcpu.asm +++ b/simd/x86_64/jsimdcpu.asm @@ -30,7 +30,7 @@ ; align 32 - global EXTN(jpeg_simd_cpu_support) + GLOBAL_FUNCTION(jpeg_simd_cpu_support) EXTN(jpeg_simd_cpu_support): push rbx