| Index: third_party/libjpeg_turbo/libjpeg.gyp
|
| ===================================================================
|
| --- third_party/libjpeg_turbo/libjpeg.gyp (revision 95020)
|
| +++ third_party/libjpeg_turbo/libjpeg.gyp (working copy)
|
| @@ -35,11 +35,10 @@
|
| 'WITH_SIMD', 'MOTION_JPEG_SUPPORTED',
|
| ],
|
| 'sources': [
|
| - 'jconfig.h',
|
| - 'jpeglib.h',
|
| - 'jpeglibmangler.h',
|
| + 'jaricom.c',
|
| 'jcapimin.c',
|
| 'jcapistd.c',
|
| + 'jcarith.c',
|
| 'jccoefct.c',
|
| 'jccolor.c',
|
| 'jcdctmgr.c',
|
| @@ -50,12 +49,14 @@
|
| 'jcmarker.c',
|
| 'jcmaster.c',
|
| 'jcomapi.c',
|
| + 'jconfig.h',
|
| 'jcparam.c',
|
| 'jcphuff.c',
|
| 'jcprepct.c',
|
| 'jcsample.c',
|
| 'jdapimin.c',
|
| 'jdapistd.c',
|
| + 'jdarith.c',
|
| 'jdatadst.c',
|
| 'jdatasrc.c',
|
| 'jdcoefct.c',
|
| @@ -87,6 +88,8 @@
|
| 'jmemsys.h',
|
| 'jmorecfg.h',
|
| 'jpegint.h',
|
| + 'jpeglib.h',
|
| + 'jpeglibmangler.h',
|
| 'jquant1.c',
|
| 'jquant2.c',
|
| 'jutils.c',
|
| @@ -104,58 +107,67 @@
|
| [ 'target_arch=="ia32"', {
|
| 'sources': [
|
| 'simd/jsimd_i386.c',
|
| - 'simd/jsimdcpu.asm',
|
| 'simd/jccolmmx.asm',
|
| + 'simd/jccolss2.asm',
|
| + 'simd/jcgrammx.asm',
|
| + 'simd/jcgrass2.asm',
|
| + 'simd/jcqnt3dn.asm',
|
| + 'simd/jcqntmmx.asm',
|
| + 'simd/jcqnts2f.asm',
|
| + 'simd/jcqnts2i.asm',
|
| + 'simd/jcqntsse.asm',
|
| + 'simd/jcsammmx.asm',
|
| + 'simd/jcsamss2.asm',
|
| 'simd/jdcolmmx.asm',
|
| - 'simd/jcsammmx.asm',
|
| + 'simd/jdcolss2.asm',
|
| + 'simd/jdmermmx.asm',
|
| + 'simd/jdmerss2.asm',
|
| 'simd/jdsammmx.asm',
|
| - 'simd/jdmermmx.asm',
|
| - 'simd/jcqntmmx.asm',
|
| + 'simd/jdsamss2.asm',
|
| + 'simd/jf3dnflt.asm',
|
| 'simd/jfmmxfst.asm',
|
| 'simd/jfmmxint.asm',
|
| - 'simd/jimmxred.asm',
|
| - 'simd/jimmxint.asm',
|
| - 'simd/jimmxfst.asm',
|
| - 'simd/jcqnt3dn.asm',
|
| - 'simd/jf3dnflt.asm',
|
| - 'simd/ji3dnflt.asm',
|
| - 'simd/jcqntsse.asm',
|
| - 'simd/jfsseflt.asm',
|
| - 'simd/jisseflt.asm',
|
| - 'simd/jccolss2.asm',
|
| - 'simd/jdcolss2.asm',
|
| - 'simd/jcsamss2.asm',
|
| - 'simd/jdsamss2.asm',
|
| - 'simd/jdmerss2.asm',
|
| - 'simd/jcqnts2i.asm',
|
| 'simd/jfss2fst.asm',
|
| 'simd/jfss2int.asm',
|
| + 'simd/jfsseflt.asm',
|
| + 'simd/ji3dnflt.asm',
|
| + 'simd/jimmxfst.asm',
|
| + 'simd/jimmxint.asm',
|
| + 'simd/jimmxred.asm',
|
| + 'simd/jiss2flt.asm',
|
| + 'simd/jiss2fst.asm',
|
| + 'simd/jiss2int.asm',
|
| 'simd/jiss2red.asm',
|
| - 'simd/jiss2int.asm',
|
| - 'simd/jiss2fst.asm',
|
| - 'simd/jcqnts2f.asm',
|
| - 'simd/jiss2flt.asm',
|
| + 'simd/jisseflt.asm',
|
| + 'simd/jsimdcpu.asm',
|
| ],
|
| }],
|
| [ 'target_arch=="x64"', {
|
| 'sources': [
|
| 'simd/jsimd_x86_64.c',
|
| - 'simd/jfsseflt-64.asm',
|
| 'simd/jccolss2-64.asm',
|
| + 'simd/jcgrass2-64.asm',
|
| + 'simd/jcqnts2f-64.asm',
|
| + 'simd/jcqnts2i-64.asm',
|
| + 'simd/jcsamss2-64.asm',
|
| 'simd/jdcolss2-64.asm',
|
| - 'simd/jcsamss2-64.asm',
|
| + 'simd/jdmerss2-64.asm',
|
| 'simd/jdsamss2-64.asm',
|
| - 'simd/jdmerss2-64.asm',
|
| - 'simd/jcqnts2i-64.asm',
|
| 'simd/jfss2fst-64.asm',
|
| 'simd/jfss2int-64.asm',
|
| + 'simd/jfsseflt-64.asm',
|
| + 'simd/jiss2flt-64.asm',
|
| + 'simd/jiss2fst-64.asm',
|
| + 'simd/jiss2int-64.asm',
|
| 'simd/jiss2red-64.asm',
|
| - 'simd/jiss2int-64.asm',
|
| - 'simd/jiss2fst-64.asm',
|
| - 'simd/jcqnts2f-64.asm',
|
| - 'simd/jiss2flt-64.asm',
|
| ],
|
| }],
|
| + [ 'target_arch=="arm"', {
|
| + 'sources': [
|
| + 'simd/jsimd_arm.c',
|
| + 'simd/jsimd_arm_neon.S',
|
| + ],
|
| + }],
|
|
|
| # Build rules for an asm file.
|
| # On Windows, we use the precompiled yasm binary. On Linux, we build
|
|
|