Make SIMD symbols private for x86[-64] ELF builds

diff --git a/simd/i386/jccolext-avx2.asm b/simd/i386/jccolext-avx2.asm
index 19e05c0d67288812a1c91e6c0bb6265c1fc0e3bd..914df7cc91d6a554f61cc504ad4f45d3a40e3f2e 100644 (file)
--- 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 4748b207e9fdb9c7db9ae0dba5844f7b1e782391..ae915333181fd7f32d9e57043accd584cfb02a05 100644 (file)
--- 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 611d80453d832ca1d1f487b83fc2a37a0f463f08..6e910d9100e5e13493f7069e32b7ba373f1f8b57 100644 (file)
--- 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 9d8c56a6731ccde59e509aa08dde41b421585be5..7e1382441e9228560ce31534730a10697a223dc2 100644 (file)
--- 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 aecdeed4064a1087a3f92ae3aefcc2c2722ba4cf..6169b93ba29a2312cdde255142c893d1f5fffb36 100644 (file)
--- 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 f9b4c9176119a0c73b51e226c11de514b4f15dc2..2f4fc067cf93a366e819164760c313e6256897b2 100644 (file)
--- 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 5d78e63839efc9956556bac84cdba0f467535aa1..0752d47d28c4727c5f09b598e4c36bfdb88aaeb1 100644 (file)
--- 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 48decc8fc78a59948c5221e7d8a526d4db1a20ae..07e79b67305c01de4a3fd8f0158ed99958ae96ef 100644 (file)
--- 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 dedfc8ac5cc5defd4b65bc13db9785bde0f95433..739937b427f31b069dc77056c3d0cdeaa640ee83 100644 (file)
--- 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 4f81c20072a4205a5f1ba4eeba88c2ffaae06063..0c71cd78227198b18329dd78b566fdf683c26bda 100644 (file)
--- 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 841eb0b5fa38f5f7069502eb0bfcef0d0a030bd9..4913f7da37b04b22bee281b8dc12316104057c3a 100644 (file)
--- 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 40505a58e3abeeb94d1ecaa4da7c9ccfdf0624f6..210443e84f58f96955b8bb34141d030dffb4559b 100644 (file)
--- 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 85b748a69bcdcefe93604efcccae17a2fd1738a2..e29f33cfc0883051135714318d01adaadae7083a 100644 (file)
--- 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 9efd415c0c3564d448c93f374628fb1580dd797e..8e9080c04570e97475c1487b574b0d2a5e9f2971 100644 (file)
--- 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 2fa6a1aa34d522ea4ced24947746a41369124e66..1bb431493e0cae139280a1ceb5a6d4d16a49e32f 100644 (file)
--- 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 3d34ab988e46be27ab512c5873a8adf13593a51c..13772eeb2d74112f2c216713d894ae5f381ad06e 100644 (file)
--- 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 1222b7706a96df8f122d1e906bd1c6983dbc249c..81789bf9078477f755ac61e37a9a2b4a7d662312 100644 (file)
--- 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 1f0614e781d4cafc6bdf95a7f2d8f7c0f3c1120d..c07be02e803e44e276172154c192a60ee3ae7299 100644 (file)
--- 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 69462ef1a3b3a401433a679fe0f8e9e915f7c09f..1200d424f9b8ab3410fc47ec1668531ed5a2bdb9 100644 (file)
--- 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 f312064e94dc3d3c59de0d1b48ed35810791e22d..e7fd7ce0e935c2090052482e52681434de99a0f2 100644 (file)
--- 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 5136fe6331da6b2f046f16139f24fda080f9aa1a..3a06417ce8d1a69f4e036f3b3769c95a097eab7d 100644 (file)
--- 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 5552dcae79446e0aabe37ffe6a2374481e31befc..fd285d32ee40cfe09d8f77ed8c9049d141b1793b 100644 (file)
--- 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 b194bb7c399fe12f49e234a73e1edde4e5b4d14e..3b3c8834461cf86f17eb20aa87c2263af21adf7a 100644 (file)
--- 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 7ce1d86b55881bcd94eb732b3d01f529413985d6..82a3d7da253b3ac58a828cbed92767836ffaa281 100644 (file)
--- 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 fc1d6ad5338698806519b1d4ebdccb5f2421e7c5..d8299fd275a38225331118858f4afde8ca9d5a2d 100644 (file)
--- 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 5f2b56752374b006d17995909055d6c4c0203ae0..87d5f4c29d55b8d714895900e7c7aeb34cf51d53 100644 (file)
--- 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 04446324ba5223fa23ae003482bc916e957ae4a9..9211a669c859976728bbcb963d3f9d9d2d4e6595 100644 (file)
--- 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 50702c6ed4ac901e517e192f97511205177afb50..b91be0c291c78f74803698596e7a5090413c9a13 100644 (file)
--- 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 d087e3d7ff6d84a33c9c373224457fa41741b2df..2f1d46e5572752db14318489c90f40eb377f9941 100644 (file)
--- 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 266ee7aeb5753418890e7a91d8cef716884bc96d..025d1799f894fc17c2ab2981f734b7ee96d6e0ac 100644 (file)
--- 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 01d96b7fe50e5722bc9176c133cba290305f38dd..1980f74a0161f53d347b95a11f48fc5c0d98cd02 100644 (file)
--- 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 c3d8fba6724ba9140d1928213e72df847ea2e311..a18acb00484a9aadaa4564d2fed602d5a66c517e 100644 (file)
--- 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 b15eb5c6e55b3ce4bff389748d47748891decf52..b1dce30c13c51ce0a616d78081da6a152128b451 100644 (file)
--- 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 f274924a5606207a236428ebba071f0bd0c79fd1..46478a876aa0692f00afefbe7de680422667971a 100644 (file)
--- 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 fb140fa9a49a12d3a7d2dcc4101dc47fa0c2eb51..8a3d9add8ca51e1dc72cc8da0b6934770474688d 100644 (file)
--- 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 4d8c7c623c6577957d55c67710794c7f51b2e2b8..38e4baa396715471d2b9268276bba6b5895b0013 100644 (file)
--- 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 c035b0c958b631680ef88feddf336cd5239b241d..ba507265fa8c9fd1e5850c49d4f2c9714471e0c9 100644 (file)
--- 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 66f2cc60f49d178878fefbf5739f7e1dd46448ee..c9dc2c6b9d95f31a3da87c82edc4dc42f790e2db 100644 (file)
--- 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 1e47cf1e215d1fdac3e31110c289fbf8392c1863..bf246a565099f62a03b25f6e2223ff896c4c6c4c 100644 (file)
--- 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 a1c99e96774ab7e56088128aa41a655b00c71929..dcec9857e21d18b76523591bfbcaee3516fcd66e 100644 (file)
--- 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 e8be84427dd9a93c96ba1a4297fc996b45e09740..25e65efde65c20996f468ffeffb1d83411a94a8a 100644 (file)
--- 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 7b5c2f2f95063a2528ab4e1bf39b90587cc13010..b9a560fbf42079bb018d4f0be7c1b04e385d6f45 100644 (file)
--- 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 51e33179e86464addeb84fdab503f37d5176858c..25032554c828d91785672e79ae7558ea3e4d1635 100644 (file)
--- 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 435f69a3634e24f48a4751eb4f795bf48005e297..6c37009aab3162d2393dc76e7f6b131ea8a4afa0 100644 (file)
--- 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 6ef7ff7ae9dd9a4ea1b8d2dd8e3bcb146372afbd..d01336646b8a27210ea176e63331cafa83d99a1b 100644 (file)
--- 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 441da7012cc6ee9aa9ebde77ee78cdbf4e7bcc3c..c681b358d01eeb520f07def286347a0664d6dee6 100644 (file)
--- 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 d5b7e2ea6798eece8977d53b7cf8e0864a4174be..f3e3c88a1af1ec64da0f5fd1a971a3461ac22636 100644 (file)
--- 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 d0609acd8b2579c7808646e9f3b60a21e9bb547b..566c753157d5b8d5f35e9ca14939080b5784b4c4 100644 (file)
--- 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 73c02cdd5378fdc7b7fa2b880144a0e14f666b59..dbf54e4e509e9b726beb8e35381c2a8e2ed1e4cc 100644 (file)
--- 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 93dea316da15811fa42ee0212924e23aa7d92850..7959224ecf8d901f62da3f1d3c717346533a9e64 100644 (file)
--- 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 d6ab9438194e1af26d066de7a39f7509479d15e2..ea7d6d5d2149ccb218b102a236c081184b91ba42 100644 (file)
--- 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 3c0000e6094f713299ab423ed80fd05411582e92..5512344120b8f206d4fa0e32e3e2b160e6731ca6 100644 (file)
--- 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 456d86ebb17feaacb53635e04a4d0fbe8f62ef1a..534053185d713455f54d8167033ca106218e8fc2 100644 (file)
--- 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 6f42947bb41afefaf46f0858fd897d0a4be8049d..99e9d4c39d7f1d59ddc6717850caf87394a30198 100644 (file)
--- 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 827aefe417f0a175c4ddc9290b2244e9814e383a..4c5e4b6a5152a3145843a12a0af792fa4bc809a8 100644 (file)
--- 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 3485d6d53cda73bd6576a19e40e40607c167addd..5cb26caf2cf9a4eaf33ce2ff042b9100021771a6 100644 (file)
--- a/simd/nasm/jsimdext.inc
+++ b/simd/nasm/jsimdext.inc
@@ -3,6 +3,7 @@
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> 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 a7e977a4c590259ddb5d8fe3e0a27dd5bae4eb43..745cb2dd511ea17eee45f1c8dd3d9479fdcf56b1 100644 (file)
--- 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 8fe072d08bd031c3c11a8126eb3d1c0affccfb30..695ab5982e08340e3cc9c20f5a4489d690c9bd2e 100644 (file)
--- 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 805c03d68700134a3fa645c690db461a0d543783..78665ec8734b2e149a46a94c87445d4dea0dcf8e 100644 (file)
--- 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 c2179db0afd4f0337da1fe3dc978083186d6c23b..6c8813bcbed0284b44b66dfcce4c3ab8cb8d797b 100644 (file)
--- 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 e6ea21e209422912e963a820a3855deefd46b57e..e7cdbc35d0d5bfe3cacfa3e55776c79879baa4e7 100644 (file)
--- 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 7cb9819a7f417be1ed048de3bdb87c1d050925b7..fbf3b125ae613d8ef57d6ae2921bdd8dec6a732a 100644 (file)
--- 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 8824a453f71918e386e97afcfcb49aec7839c51d..da5359b22e5f365f8061c033fea14a0542b7025b 100644 (file)
--- 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 d26ada3dcc67672ffc8be7a65b7fe2d95fca04ec..b8a4c64661dbbb2205598ba069faf35226529714 100644 (file)
--- 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 bedc6394815ac70fad0a8b4c2be87c5b71009057..1fcd390c07280086c6a088686d777bbb559b9f22 100644 (file)
--- 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 d7877ea6677846773609c98943e42c33c37e9fe2..29f41774cb4b8273610b43500818a20ba2fdf878 100644 (file)
--- 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 2e5d3f5b06c44d1e4725824e0c2ab87c45cb6140..aca8bdb5115bb6e314a2b98ca28a0fe7e909489f 100644 (file)
--- 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 ca81ad84cc625a5ac7d900e28621278fcf22cd9a..eba95c20fbf544a9c62e6b29415d947159015170 100644 (file)
--- 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 f49709ff419d8d2f592154e284956e13141110eb..bbe53fd7545b7fd69440cc7e80dfa04ec1d8ffb4 100644 (file)
--- 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 dd878a9d8cc5706b83d83c355cd6bf06ff27c868..7a83d67ed5667472c3d54521b50000db9d0ad511 100644 (file)
--- 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 55e10a4119d03dedb108f0f2b05b72b255855802..e6b7dd1f975b637137d62c5702762a1150794e1c 100644 (file)
--- 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 fa3a321d6d78997c3d665a6d6a1433d6e74feceb..7209cbb27f8103ec9f1e840240353d8215cf9ebe 100644 (file)
--- 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 a488916072438c63b6e5adf0c48fb2c685aefbdd..45a737b791108b112b264a63e97dbe757782a66f 100644 (file)
--- 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 546a9e5ea0c1f5ffc93402411707ac3c1d1beb62..a8b51979689b7b06cef0bb2b6cba9cb7c32f5aaa 100644 (file)
--- 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 4c2bb04938b6aa040108c7843f28361c806473f8..514ccdabb19ef1fd8281af9d6a6ce90f5f3c76c0 100644 (file)
--- 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 f3384ca82566c6bd18e82983c8b7fd16f660a5d8..9260b786fec94a94e90c6779506c97d38e9d00b8 100644 (file)
--- 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 42a8e7842999289c6bf3e2719092279159c76a68..c2b6c21f803411f7f9280b613774d214b0a8b785 100644 (file)
--- 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 127ef28a51e07bc3bb0a09ae7c3cabc6be5b4caf..ef79ec5732b3dc16068b911d0fbb80208a0f8757 100644 (file)
--- 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 479e5da9d163f30981ed0b0aa46dce50aeecdfe4..ef8da741f3864f21fc13421345df5001f663ed9c 100644 (file)
--- 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 b3e2d0b11620cee1d5b2d7c1c3003a6e8498735b..f6df504c6288b806f03285753bb3f47155ff0ead 100644 (file)
--- 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 cdaa56f4e92c4118d9a626e2eb5c1072bff0ba30..a112cb1c76350d0834868a26fd5b40634980c12d 100644 (file)
--- 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 6f22339a95f2cab756d824604d468d977074eef2..153386a4f9439cc76bda39b6126e06001c393d64 100644 (file)
--- 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 422ad1b7ec3d67281e3c3352135b1024c9e5f121..3122a61887fa648a7a0db7741b7edd609ce7036f 100644 (file)
--- 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 3cbdc276b96933096aa526572b5eab1a748cf43f..3287439a80e2a3cc3ce2c8da14d9decd7ab92a7e 100644 (file)
--- 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 6487266fe204c1917d278e04bf7fc6b755a87c1d..1f7d9992ea0c58c13c951067a62c48b77ea8d52d 100644 (file)
--- 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 69b71f0b8387cf72cf5c74671ca39462b31b27ea..48aca077674509958d9b6635d485fecf62e84bb2 100644 (file)
--- 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 3699d44df36a1afb71362326ed30550cc617dfc5..6785e6a19d25cc5938f6bf7017fdc52636890771 100644 (file)
--- 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 ec96da500963d0d42fd49327230ffc110d40b521..b28793092ed6da260c752c482364f43c5f4189e3 100644 (file)
--- 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 4b0873e0abf5ea1a84e2d189c76df9efe5ecd3d2..6732c3140baf83203b6840d5713e740f1510a319 100644 (file)
--- 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 a1ebb85bc48b0b1e7e9b9fdf16b8d67b77585c19..4dbcc685ea1f9d143e2d1beb3e8da1b74a16fe42 100644 (file)
--- 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