YASM support

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@606 3789f03b-4d11-0410-bbf8-ca57d06f2519

25 files changed, 46 insertions, 24 deletions

diff --git a/trunk/simd/jcclrmmx.asm b/trunk/simd/jcclrmmx.asm
index b6b8912..e095253 100644
--- a/trunk/simd/jcclrmmx.asm
+++ b/trunk/simd/jcclrmmx.asm
@@ -19,8 +19,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jcclrss2-64.asm b/trunk/simd/jcclrss2-64.asm
index 8ca47aa..f5d6bed 100644
--- a/trunk/simd/jcclrss2-64.asm
+++ b/trunk/simd/jcclrss2-64.asm
@@ -17,8 +17,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	64
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jcclrss2.asm b/trunk/simd/jcclrss2.asm
index 8def718..517b705 100644
--- a/trunk/simd/jcclrss2.asm
+++ b/trunk/simd/jcclrss2.asm
@@ -16,8 +16,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jccolmmx.asm b/trunk/simd/jccolmmx.asm
index 5e7f3be..d0f0d79 100644
--- a/trunk/simd/jccolmmx.asm
+++ b/trunk/simd/jccolmmx.asm
@@ -51,6 +51,9 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jcclrmmx.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jccolss2-64.asm b/trunk/simd/jccolss2-64.asm
index 64ee0ba..18de456 100644
--- a/trunk/simd/jccolss2-64.asm
+++ b/trunk/simd/jccolss2-64.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	64
+
 %include "jcclrss2-64.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jccolss2.asm b/trunk/simd/jccolss2.asm
index 8d1f734..7acb59c 100644
--- a/trunk/simd/jccolss2.asm
+++ b/trunk/simd/jccolss2.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jcclrss2.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jcgrammx.asm b/trunk/simd/jcgrammx.asm
index dd46cc5..8c96824 100644
--- a/trunk/simd/jcgrammx.asm
+++ b/trunk/simd/jcgrammx.asm
@@ -44,6 +44,9 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jcgrymmx.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jcgrass2-64.asm b/trunk/simd/jcgrass2-64.asm
index 9f8a01a..232f329 100644
--- a/trunk/simd/jcgrass2-64.asm
+++ b/trunk/simd/jcgrass2-64.asm
@@ -41,6 +41,9 @@ PD_ONEHALF	times 4 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	64
+
 %include "jcgryss2-64.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jcgrass2.asm b/trunk/simd/jcgrass2.asm
index f284e0f..45ea33a 100644
--- a/trunk/simd/jcgrass2.asm
+++ b/trunk/simd/jcgrass2.asm
@@ -41,6 +41,9 @@ PD_ONEHALF	times 4 dd  (1 << (SCALEBITS-1))
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jcgryss2.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jcgrymmx.asm b/trunk/simd/jcgrymmx.asm
index 481a619..bbeea09 100644
--- a/trunk/simd/jcgrymmx.asm
+++ b/trunk/simd/jcgrymmx.asm
@@ -20,8 +20,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jcgryss2-64.asm b/trunk/simd/jcgryss2-64.asm
index 3a52ec2..23ae8af 100644
--- a/trunk/simd/jcgryss2-64.asm
+++ b/trunk/simd/jcgryss2-64.asm
@@ -17,8 +17,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	64
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jcgryss2.asm b/trunk/simd/jcgryss2.asm
index 6eac030..c294287 100644
--- a/trunk/simd/jcgryss2.asm
+++ b/trunk/simd/jcgryss2.asm
@@ -17,8 +17,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jdclrmmx.asm b/trunk/simd/jdclrmmx.asm
index 79772e0..1c255e8 100644
--- a/trunk/simd/jdclrmmx.asm
+++ b/trunk/simd/jdclrmmx.asm
@@ -19,8 +19,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jdclrss2-64.asm b/trunk/simd/jdclrss2-64.asm
index 4282bd2..fdb33a3 100644
--- a/trunk/simd/jdclrss2-64.asm
+++ b/trunk/simd/jdclrss2-64.asm
@@ -20,8 +20,6 @@
 %include "jcolsamp.inc"
 				
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	64
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jdclrss2.asm b/trunk/simd/jdclrss2.asm
index 865fa82..3059d7d 100644
--- a/trunk/simd/jdclrss2.asm
+++ b/trunk/simd/jdclrss2.asm
@@ -19,8 +19,6 @@
 %include "jcolsamp.inc"
 				
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Convert some rows of samples to the output colorspace.
 ;
diff --git a/trunk/simd/jdcolmmx.asm b/trunk/simd/jdcolmmx.asm
index 58775e8..0834bab 100644
--- a/trunk/simd/jdcolmmx.asm
+++ b/trunk/simd/jdcolmmx.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 2 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jdclrmmx.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdcolss2-64.asm b/trunk/simd/jdcolss2-64.asm
index 2e97d59..d14a28a 100644
--- a/trunk/simd/jdcolss2-64.asm
+++ b/trunk/simd/jdcolss2-64.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	64
+
 %include "jdclrss2-64.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdcolss2.asm b/trunk/simd/jdcolss2.asm
index 7ae985d..cab4dd0 100644
--- a/trunk/simd/jdcolss2.asm
+++ b/trunk/simd/jdcolss2.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jdclrss2.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdmermmx.asm b/trunk/simd/jdmermmx.asm
index fd587fb..75baaa5 100644
--- a/trunk/simd/jdmermmx.asm
+++ b/trunk/simd/jdmermmx.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 2 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jdmrgmmx.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdmerss2-64.asm b/trunk/simd/jdmerss2-64.asm
index 1f0b10f..a1fe963 100644
--- a/trunk/simd/jdmerss2-64.asm
+++ b/trunk/simd/jdmerss2-64.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	64
+
 %include "jdmrgss2-64.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdmerss2.asm b/trunk/simd/jdmerss2.asm
index 2294e0d..21881b4 100644
--- a/trunk/simd/jdmerss2.asm
+++ b/trunk/simd/jdmerss2.asm
@@ -48,6 +48,9 @@ PD_ONEHALF	times 4 dd  1 << (SCALEBITS-1)
 	alignz	16
 
 ; --------------------------------------------------------------------------
+	SECTION	SEG_TEXT
+	BITS	32
+
 %include "jdmrgss2.asm"
 
 %undef RGB_RED
diff --git a/trunk/simd/jdmrgmmx.asm b/trunk/simd/jdmrgmmx.asm
index b5777a3..d0800a7 100644
--- a/trunk/simd/jdmrgmmx.asm
+++ b/trunk/simd/jdmrgmmx.asm
@@ -19,8 +19,6 @@
 %include "jcolsamp.inc"
 
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
 ;
diff --git a/trunk/simd/jdmrgss2-64.asm b/trunk/simd/jdmrgss2-64.asm
index 121bb82..0c2503f 100644
--- a/trunk/simd/jdmrgss2-64.asm
+++ b/trunk/simd/jdmrgss2-64.asm
@@ -20,8 +20,6 @@
 %include "jcolsamp.inc"
 				
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	64
 ;
 ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
 ;
diff --git a/trunk/simd/jdmrgss2.asm b/trunk/simd/jdmrgss2.asm
index 99b7eb9..368ac3c 100644
--- a/trunk/simd/jdmrgss2.asm
+++ b/trunk/simd/jdmrgss2.asm
@@ -19,8 +19,6 @@
 %include "jcolsamp.inc"
 				
 ; --------------------------------------------------------------------------
-	SECTION	SEG_TEXT
-	BITS	32
 ;
 ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
 ;
diff --git a/trunk/simd/jsimdext.inc b/trunk/simd/jsimdext.inc
index c4297f9..fd97da3 100644
--- a/trunk/simd/jsimdext.inc
+++ b/trunk/simd/jsimdext.inc
@@ -38,16 +38,26 @@
 
 ; -- segment definition --
 ;
+%ifdef __YASM_VER__
+%define SEG_TEXT    .text  align=16
+%define SEG_CONST   .rdata align=16
+%else
 %define SEG_TEXT    .text  align=16 public use32 class=CODE
 %define SEG_CONST   .rdata align=16 public use32 class=CONST
+%endif
 
 %elifdef WIN64	; ----(nasm -fwin64 -DWIN64 ...)--------
 ; * Microsoft Visual C++
 
 ; -- segment definition --
 ;
+%ifdef __YASM_VER__
+%define SEG_TEXT    .text  align=16
+%define SEG_CONST   .rdata align=16
+%else
 %define SEG_TEXT    .text  align=16 public use64 class=CODE
 %define SEG_CONST   .rdata align=16 public use64 class=CONST
+%endif
 %define EXTN(name)  name			; foo() -> foo
 
 %elifdef OBJ32	; ----(nasm -fobj -DOBJ32 ...)----------