YASM support

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@606 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 726d6d04d15fbbbd68f36a2c291fc7f1346fbc24..a546e50ed644ee867883bc9cfc5f577cdce6c5ff 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -38,6 +38,8 @@ libjpeg BSD-style license, so the libjpeg-turbo library itself (libjpeg) is no
 longer subject to the terms of the wxWindows Library License (libturbojpeg
 still is-- see README-turbo.txt.)
 
+[11] libjpeg-turbo can now be built with YASM.
+
 
 1.1.1
 =====

diff --git a/acinclude.m4 b/acinclude.m4
index cc10a215193b3cfd2bd37812be978a3f02ed180d..9ac97617d5648269777df6e2af9cb69f367d5209 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3,7 +3,7 @@
 # Check that NASM exists and determine flags
 AC_DEFUN([AC_PROG_NASM],[
 
-AC_CHECK_PROGS(NASM, [nasm nasmw])
+AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
 test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
 
 AC_MSG_CHECKING([for object file format of host system])

diff --git a/simd/jcclrmmx.asm b/simd/jcclrmmx.asm
index b6b89121b5fe3b5b0c8e5379377956db9a2198b2..e09525310e87c3e0b56f07798236b0c6bab8b36a 100644 (file)
--- a/simd/jcclrmmx.asm
+++ b/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/simd/jcclrss2-64.asm b/simd/jcclrss2-64.asm
index 8ca47aa06cfee8e58fa00dcaf87e1a54701f1d32..f5d6bed955ce445b2561712e28865f2363ddd011 100644 (file)
--- a/simd/jcclrss2-64.asm
+++ b/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/simd/jcclrss2.asm b/simd/jcclrss2.asm
index 8def718cb1720c9ce0fa80c4ad7f1ae405ad5479..517b7056388aa5d0f55e649f3c8aa6d4ccd26707 100644 (file)
--- a/simd/jcclrss2.asm
+++ b/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/simd/jccolmmx.asm b/simd/jccolmmx.asm
index 5e7f3be994ee994035ffb43b3f7e7961bc2f028f..d0f0d7926e04a8147bbf26e4c7806e2c9b3b36bb 100644 (file)
--- a/simd/jccolmmx.asm
+++ b/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/simd/jccolss2-64.asm b/simd/jccolss2-64.asm
index 64ee0ba85d516e3c634930cd967c256c21098916..18de456b2e4e9c68d6dfe6bfbfb3ada5f64fa561 100644 (file)
--- a/simd/jccolss2-64.asm
+++ b/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/simd/jccolss2.asm b/simd/jccolss2.asm
index 8d1f73406e8a439f0485cac09a3f7054bf55ee25..7acb59c5f46c868be6f954fec33390ce83921267 100644 (file)
--- a/simd/jccolss2.asm
+++ b/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/simd/jcgrammx.asm b/simd/jcgrammx.asm
index dd46cc5b290276512841b5616cfd21fc7385cd85..8c968248d05a61129848b075a94ca1ce3cf936e1 100644 (file)
--- a/simd/jcgrammx.asm
+++ b/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/simd/jcgrass2-64.asm b/simd/jcgrass2-64.asm
index 9f8a01a1f9d0f1d5973ad9bea29d264bccad150f..232f32995def94ecfdd8a77b270d2cf082a95c48 100644 (file)
--- a/simd/jcgrass2-64.asm
+++ b/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/simd/jcgrass2.asm b/simd/jcgrass2.asm
index f284e0fb5f03155b0cc1b5bf3fcbdfbfd831e20e..45ea33a8be25c1b72a7901cec2c3a3deaa771a93 100644 (file)
--- a/simd/jcgrass2.asm
+++ b/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/simd/jcgrymmx.asm b/simd/jcgrymmx.asm
index 481a61965319d6e99971f625305c50c2f234490b..bbeea09bec965338348803adf52cd96df8e9c0e1 100644 (file)
--- a/simd/jcgrymmx.asm
+++ b/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/simd/jcgryss2-64.asm b/simd/jcgryss2-64.asm
index 3a52ec2e71c1bf202cce2bb6172d42f473d0df99..23ae8afb15317dff01e7400b092334f753f2731c 100644 (file)
--- a/simd/jcgryss2-64.asm
+++ b/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/simd/jcgryss2.asm b/simd/jcgryss2.asm
index 6eac030ac9eaca2b8022ec9f05e4689fe9d6c725..c294287939e780b8809a8529ae72d029237f5379 100644 (file)
--- a/simd/jcgryss2.asm
+++ b/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/simd/jdclrmmx.asm b/simd/jdclrmmx.asm
index 79772e0c2726d0bf1e1bbcafb4d3ee6dba40cf64..1c255e802d405628ba33061491f0f3e557706958 100644 (file)
--- a/simd/jdclrmmx.asm
+++ b/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/simd/jdclrss2-64.asm b/simd/jdclrss2-64.asm
index 4282bd269f33bf9e51bb7c77bd4726c0f6d71af7..fdb33a3627457238dbd9d65ff6237773ca2f845e 100644 (file)
--- a/simd/jdclrss2-64.asm
+++ b/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/simd/jdclrss2.asm b/simd/jdclrss2.asm
index 865fa8245d3845481aba54e566540c57710c9ca7..3059d7d9d931bdc9aababc3f63ddcf43b7dc15a1 100644 (file)
--- a/simd/jdclrss2.asm
+++ b/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/simd/jdcolmmx.asm b/simd/jdcolmmx.asm
index 58775e8547dc185d3b80742df0af27cad3502142..0834babe4331df4c09fba3732971e1186af93732 100644 (file)
--- a/simd/jdcolmmx.asm
+++ b/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/simd/jdcolss2-64.asm b/simd/jdcolss2-64.asm
index 2e97d5930838c7bedc851004fbd7ee581c792847..d14a28aae16ca1e6cfc16f2374104245101c9cf2 100644 (file)
--- a/simd/jdcolss2-64.asm
+++ b/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/simd/jdcolss2.asm b/simd/jdcolss2.asm
index 7ae985d6a9af36cc5229c00a6f6ca64f9888d67f..cab4dd02c81792f21327b08c131bf612d059b218 100644 (file)
--- a/simd/jdcolss2.asm
+++ b/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/simd/jdmermmx.asm b/simd/jdmermmx.asm
index fd587fbc1247d8504b07313d7486e4d2e04e6286..75baaa5744d606af6fae4e9bd5634e29ea972c3b 100644 (file)
--- a/simd/jdmermmx.asm
+++ b/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/simd/jdmerss2-64.asm b/simd/jdmerss2-64.asm
index 1f0b10faac8d5e8041277c4081825855d16e1696..a1fe9635784d510936e2049cbe0a82c0ca00c3a3 100644 (file)
--- a/simd/jdmerss2-64.asm
+++ b/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/simd/jdmerss2.asm b/simd/jdmerss2.asm
index 2294e0d3ef3150cfbc8f323cfeaa0c4d9e96361d..21881b40f49335a22830a322a4d64c8a3a83992c 100644 (file)
--- a/simd/jdmerss2.asm
+++ b/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/simd/jdmrgmmx.asm b/simd/jdmrgmmx.asm
index b5777a3e165ace2b836e37ac944aa40db35a174f..d0800a737d749347ee94e4898cb9801f06185278 100644 (file)
--- a/simd/jdmrgmmx.asm
+++ b/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/simd/jdmrgss2-64.asm b/simd/jdmrgss2-64.asm
index 121bb82bc55a102584700492af64ba8f2bcbace7..0c2503f54b3e540b2973288149ece1883c8082aa 100644 (file)
--- a/simd/jdmrgss2-64.asm
+++ b/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/simd/jdmrgss2.asm b/simd/jdmrgss2.asm
index 99b7eb9f0f34e2a585d925a50a108ddd163f5661..368ac3ccf7f649780098e95656e99ea14b06ff24 100644 (file)
--- a/simd/jdmrgss2.asm
+++ b/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/simd/jsimdext.inc b/simd/jsimdext.inc
index c4297f9cf49e2da705073405324501770abb5325..fd97da3c932f039bf37711b4b30f9dc867eb75d4 100644 (file)
--- a/simd/jsimdext.inc
+++ b/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 ...)----------