Update libjpeg-turbo.

google.patch

 Index: jdmarker.c
 ===================================================================
---- jdmarker.c  (revision 733)
+--- jdmarker.c  (revision 829)
 +++ jdmarker.c  (working copy)
-@@ -906,7 +906,7 @@
+@@ -910,7 +910,7 @@
    }
  
    if (cinfo->marker->discarded_bytes != 0) {
 -    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
 +    TRACEMS2(cinfo, 1, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
      cinfo->marker->discarded_bytes = 0;
    }
  
-@@ -940,7 +940,144 @@
+@@ -944,7 +944,144 @@
    return TRUE;
  }
  
 +#ifdef MOTION_JPEG_SUPPORTED
  
 +/* The default Huffman tables used by motion JPEG frames. When a motion JPEG
 + * frame does not have DHT tables, we should use the huffman tables suggested by
 + * the JPEG standard. Each of these tables represents a member of the JHUFF_TBLS
 + * struct so we can just copy it to the according JHUFF_TBLS member.
 + */
@@ skipping 124 matching lines @@
 +#else
 +
 +#define mjpg_load_huff_tables(cinfo)
 +
 +#endif /* MOTION_JPEG_SUPPORTED */
 +
 +
  /*
   * Read markers until SOS or EOI.
   *
-@@ -1009,6 +1146,7 @@
+@@ -1013,6 +1150,7 @@
        break;
  
      case M_SOS:
 +      mjpg_load_huff_tables(cinfo);
        if (! get_sos(cinfo))
         return JPEG_SUSPENDED;
        cinfo->unread_marker = 0;        /* processed the marker */
 Index: jmorecfg.h
 ===================================================================
---- jmorecfg.h  (revision 733)
+--- jmorecfg.h  (revision 829)
 +++ jmorecfg.h  (working copy)
 @@ -153,14 +153,18 @@
  /* INT16 must hold at least the values -32768..32767. */
  
  #ifndef XMD_H                  /* X11/xmd.h correctly defines INT16 */
 +#ifndef _BASETSD_H_            /* basetsd.h correctly defines INT32 */
  typedef short INT16;
  #endif
 +#endif
  
@@ skipping 16 matching lines @@
  #define FAR  far
  #else
  #define FAR
  #endif
 +#endif
  
  
  /*
 Index: jpeglib.h
 ===================================================================
---- jpeglib.h   (revision 733)
+--- jpeglib.h   (revision 829)
 +++ jpeglib.h   (working copy)
 @@ -15,6 +15,10 @@
  #ifndef JPEGLIB_H
  #define JPEGLIB_H
  
 +/* Begin chromium edits */
 +#include "jpeglibmangler.h"
 +/* End chromium edits */
 +
  /*
@@ skipping 112 matching lines @@
 +#define jpeg_get_large chromium_jpeg_get_large
 +#define jpeg_free_large chromium_jpeg_free_large
 +#define jpeg_mem_available chromium_jpeg_mem_available
 +#define jpeg_open_backing_store chromium_jpeg_open_backing_store
 +#define jpeg_mem_init chromium_jpeg_mem_init
 +#define jpeg_mem_term chromium_jpeg_mem_term
 +
 +#endif  // THIRD_PARTY_LIBJPEG_TURBO_JPEGLIBMANGLER_H_
 Index: simd/jcgrass2-64.asm
 ===================================================================
---- simd/jcgrass2-64.asm        (revision 733)
+--- simd/jcgrass2-64.asm        (revision 829)
 +++ simd/jcgrass2-64.asm        (working copy)
 @@ -30,7 +30,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_gray_convert_sse2)
 +       global  EXTN(jconst_rgb_gray_convert_sse2) PRIVATE
  
  EXTN(jconst_rgb_gray_convert_sse2):
  
 Index: simd/jiss2fst.asm
 ===================================================================
---- simd/jiss2fst.asm   (revision 733)
+--- simd/jiss2fst.asm   (revision 829)
 +++ simd/jiss2fst.asm   (working copy)
 @@ -59,7 +59,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_idct_ifast_sse2)
 +       global  EXTN(jconst_idct_ifast_sse2) PRIVATE
  
  EXTN(jconst_idct_ifast_sse2):
  
 @@ -92,7 +92,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_idct_ifast_sse2)
 +       global  EXTN(jsimd_idct_ifast_sse2) PRIVATE
  
  EXTN(jsimd_idct_ifast_sse2):
         push    ebp
+Index: simd/jcclrss2-64.asm
+===================================================================
+--- simd/jcclrss2-64.asm        (revision 829)
++++ simd/jcclrss2-64.asm        (working copy)
+@@ -37,7 +37,7 @@
+ 
+        align   16
+ 
+-       global  EXTN(jsimd_rgb_ycc_convert_sse2)
++       global  EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
+ 
+ EXTN(jsimd_rgb_ycc_convert_sse2):
+        push    rbp
 Index: simd/jiss2red-64.asm
 ===================================================================
---- simd/jiss2red-64.asm        (revision 733)
+--- simd/jiss2red-64.asm        (revision 829)
 +++ simd/jiss2red-64.asm        (working copy)
 @@ -73,7 +73,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_red_sse2)
 +       global  EXTN(jconst_idct_red_sse2) PRIVATE
  
  EXTN(jconst_idct_red_sse2):
  
 @@ -114,7 +114,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_idct_4x4_sse2)
 +       global  EXTN(jsimd_idct_4x4_sse2) PRIVATE
  
  EXTN(jsimd_idct_4x4_sse2):
         push    rbp
 @@ -413,7 +413,7 @@
  ; r13 = JDIMENSION output_col
  
         align   16
 -       global  EXTN(jsimd_idct_2x2_sse2)
 +       global  EXTN(jsimd_idct_2x2_sse2) PRIVATE
  
  EXTN(jsimd_idct_2x2_sse2):
         push    rbp
-Index: simd/jcclrss2-64.asm
-===================================================================
---- simd/jcclrss2-64.asm        (revision 733)
-+++ simd/jcclrss2-64.asm        (working copy)
-@@ -37,7 +37,7 @@
- 
-        align   16
- 
--       global  EXTN(jsimd_rgb_ycc_convert_sse2)
-+       global  EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
- 
- EXTN(jsimd_rgb_ycc_convert_sse2):
-        push    rbp
 Index: simd/ji3dnflt.asm
 ===================================================================
---- simd/ji3dnflt.asm   (revision 733)
+--- simd/ji3dnflt.asm   (revision 829)
 +++ simd/ji3dnflt.asm   (working copy)
 @@ -27,7 +27,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_float_3dnow)
 +       global  EXTN(jconst_idct_float_3dnow) PRIVATE
  
  EXTN(jconst_idct_float_3dnow):
  
 @@ -63,7 +63,7 @@
                                         ; FAST_FLOAT workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_float_3dnow)
 +       global  EXTN(jsimd_idct_float_3dnow) PRIVATE
  
  EXTN(jsimd_idct_float_3dnow):
         push    ebp
 Index: simd/jsimdcpu.asm
 ===================================================================
---- simd/jsimdcpu.asm   (revision 733)
+--- simd/jsimdcpu.asm   (revision 829)
 +++ simd/jsimdcpu.asm   (working copy)
 @@ -29,7 +29,7 @@
  ;
  
         align   16
 -       global  EXTN(jpeg_simd_cpu_support)
 +       global  EXTN(jpeg_simd_cpu_support) PRIVATE
  
  EXTN(jpeg_simd_cpu_support):
         push    ebx
+Index: simd/jdmerss2-64.asm
+===================================================================
+--- simd/jdmerss2-64.asm        (revision 829)
++++ simd/jdmerss2-64.asm        (working copy)
+@@ -35,7 +35,7 @@
+        SECTION SEG_CONST
+ 
+        alignz  16
+-       global  EXTN(jconst_merged_upsample_sse2)
++       global  EXTN(jconst_merged_upsample_sse2) PRIVATE
+ 
+ EXTN(jconst_merged_upsample_sse2):
+ 
 Index: simd/jdsammmx.asm
 ===================================================================
---- simd/jdsammmx.asm   (revision 733)
+--- simd/jdsammmx.asm   (revision 829)
 +++ simd/jdsammmx.asm   (working copy)
 @@ -22,7 +22,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fancy_upsample_mmx)
 +       global  EXTN(jconst_fancy_upsample_mmx) PRIVATE
  
  EXTN(jconst_fancy_upsample_mmx):
  
@@ skipping 26 matching lines @@
         push    ebp
 @@ -643,7 +643,7 @@
  %define output_data_ptr(b)     (b)+20          ; JSAMPARRAY * output_data_ptr
  
         align   16
 -       global  EXTN(jsimd_h2v2_upsample_mmx)
 +       global  EXTN(jsimd_h2v2_upsample_mmx) PRIVATE
  
  EXTN(jsimd_h2v2_upsample_mmx):
         push    ebp
-Index: simd/jdmerss2-64.asm
-===================================================================
---- simd/jdmerss2-64.asm        (revision 733)
-+++ simd/jdmerss2-64.asm        (working copy)
-@@ -35,7 +35,7 @@
-        SECTION SEG_CONST
- 
-        alignz  16
--       global  EXTN(jconst_merged_upsample_sse2)
-+       global  EXTN(jconst_merged_upsample_sse2) PRIVATE
- 
- EXTN(jconst_merged_upsample_sse2):
- 
 Index: simd/jdmrgmmx.asm
 ===================================================================
---- simd/jdmrgmmx.asm   (revision 733)
+--- simd/jdmrgmmx.asm   (revision 829)
 +++ simd/jdmrgmmx.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_h2v1_merged_upsample_mmx)
 +       global  EXTN(jsimd_h2v1_merged_upsample_mmx) PRIVATE
  
  EXTN(jsimd_h2v1_merged_upsample_mmx):
         push    ebp
 @@ -409,7 +409,7 @@
  %define output_buf(b)          (b)+20          ; JSAMPARRAY output_buf
  
         align   16
 -       global  EXTN(jsimd_h2v2_merged_upsample_mmx)
 +       global  EXTN(jsimd_h2v2_merged_upsample_mmx) PRIVATE
  
  EXTN(jsimd_h2v2_merged_upsample_mmx):
         push    ebp
 Index: simd/jdsamss2.asm
 ===================================================================
---- simd/jdsamss2.asm   (revision 733)
+--- simd/jdsamss2.asm   (revision 829)
 +++ simd/jdsamss2.asm   (working copy)
 @@ -22,7 +22,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fancy_upsample_sse2)
 +       global  EXTN(jconst_fancy_upsample_sse2) PRIVATE
  
  EXTN(jconst_fancy_upsample_sse2):
  
@@ skipping 28 matching lines @@
  %define output_data_ptr(b)     (b)+20          ; JSAMPARRAY * output_data_ptr
  
         align   16
 -       global  EXTN(jsimd_h2v2_upsample_sse2)
 +       global  EXTN(jsimd_h2v2_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_upsample_sse2):
         push    ebp
 Index: simd/jiss2flt-64.asm
 ===================================================================
---- simd/jiss2flt-64.asm        (revision 733)
+--- simd/jiss2flt-64.asm        (revision 829)
 +++ simd/jiss2flt-64.asm        (working copy)
 @@ -38,7 +38,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_float_sse2)
 +       global  EXTN(jconst_idct_float_sse2) PRIVATE
  
  EXTN(jconst_idct_float_sse2):
  
 @@ -74,7 +74,7 @@
                                         ; FAST_FLOAT workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_float_sse2)
 +       global  EXTN(jsimd_idct_float_sse2) PRIVATE
  
  EXTN(jsimd_idct_float_sse2):
         push    rbp
 Index: simd/jfss2int-64.asm
 ===================================================================
---- simd/jfss2int-64.asm        (revision 733)
+--- simd/jfss2int-64.asm        (revision 829)
 +++ simd/jfss2int-64.asm        (working copy)
 @@ -67,7 +67,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_islow_sse2)
 +       global  EXTN(jconst_fdct_islow_sse2) PRIVATE
  
  EXTN(jconst_fdct_islow_sse2):
  
 @@ -101,7 +101,7 @@
  %define WK_NUM         6
  
         align   16
 -       global  EXTN(jsimd_fdct_islow_sse2)
 +       global  EXTN(jsimd_fdct_islow_sse2) PRIVATE
  
  EXTN(jsimd_fdct_islow_sse2):
         push    rbp
 Index: simd/jcqnts2f.asm
 ===================================================================
---- simd/jcqnts2f.asm   (revision 733)
+--- simd/jcqnts2f.asm   (revision 829)
 +++ simd/jcqnts2f.asm   (working copy)
 @@ -35,7 +35,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_float_sse2)
 +       global  EXTN(jsimd_convsamp_float_sse2) PRIVATE
  
  EXTN(jsimd_convsamp_float_sse2):
         push    ebp
 @@ -115,7 +115,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_float_sse2)
 +       global  EXTN(jsimd_quantize_float_sse2) PRIVATE
  
  EXTN(jsimd_quantize_float_sse2):
         push    ebp
 Index: simd/jdmrgss2.asm
 ===================================================================
---- simd/jdmrgss2.asm   (revision 733)
+--- simd/jdmrgss2.asm   (revision 829)
 +++ simd/jdmrgss2.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_h2v1_merged_upsample_sse2)
 +       global  EXTN(jsimd_h2v1_merged_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v1_merged_upsample_sse2):
         push    ebp
 @@ -560,7 +560,7 @@
  %define output_buf(b)          (b)+20          ; JSAMPARRAY output_buf
  
         align   16
 -       global  EXTN(jsimd_h2v2_merged_upsample_sse2)
 +       global  EXTN(jsimd_h2v2_merged_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_merged_upsample_sse2):
         push    ebp
 Index: simd/jfmmxint.asm
 ===================================================================
---- simd/jfmmxint.asm   (revision 733)
+--- simd/jfmmxint.asm   (revision 829)
 +++ simd/jfmmxint.asm   (working copy)
 @@ -66,7 +66,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_islow_mmx)
 +       global  EXTN(jconst_fdct_islow_mmx) PRIVATE
  
  EXTN(jconst_fdct_islow_mmx):
  
 @@ -101,7 +101,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_islow_mmx)
 +       global  EXTN(jsimd_fdct_islow_mmx) PRIVATE
  
  EXTN(jsimd_fdct_islow_mmx):
         push    ebp
 Index: simd/jcgryss2-64.asm
 ===================================================================
---- simd/jcgryss2-64.asm        (revision 733)
+--- simd/jcgryss2-64.asm        (revision 829)
 +++ simd/jcgryss2-64.asm        (working copy)
 @@ -37,7 +37,7 @@
  
         align   16
  
 -       global  EXTN(jsimd_rgb_gray_convert_sse2)
 +       global  EXTN(jsimd_rgb_gray_convert_sse2) PRIVATE
  
  EXTN(jsimd_rgb_gray_convert_sse2):
         push    rbp
 Index: simd/jcqnts2i.asm
 ===================================================================
---- simd/jcqnts2i.asm   (revision 733)
+--- simd/jcqnts2i.asm   (revision 829)
 +++ simd/jcqnts2i.asm   (working copy)
 @@ -35,7 +35,7 @@
  %define workspace      ebp+16          ; DCTELEM * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_sse2)
 +       global  EXTN(jsimd_convsamp_sse2) PRIVATE
  
  EXTN(jsimd_convsamp_sse2):
         push    ebp
 @@ -117,7 +117,7 @@
  %define workspace      ebp+16          ; DCTELEM * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_sse2)
 +       global  EXTN(jsimd_quantize_sse2) PRIVATE
  
  EXTN(jsimd_quantize_sse2):
         push    ebp
 Index: simd/jiss2fst-64.asm
 ===================================================================
---- simd/jiss2fst-64.asm        (revision 733)
+--- simd/jiss2fst-64.asm        (revision 829)
 +++ simd/jiss2fst-64.asm        (working copy)
 @@ -60,7 +60,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_idct_ifast_sse2)
 +       global  EXTN(jconst_idct_ifast_sse2) PRIVATE
  
  EXTN(jconst_idct_ifast_sse2):
  
 @@ -93,7 +93,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_idct_ifast_sse2)
 +       global  EXTN(jsimd_idct_ifast_sse2) PRIVATE
  
  EXTN(jsimd_idct_ifast_sse2):
         push    rbp
 Index: simd/jiss2flt.asm
 ===================================================================
---- simd/jiss2flt.asm   (revision 733)
+--- simd/jiss2flt.asm   (revision 829)
 +++ simd/jiss2flt.asm   (working copy)
 @@ -37,7 +37,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_float_sse2)
 +       global  EXTN(jconst_idct_float_sse2) PRIVATE
  
  EXTN(jconst_idct_float_sse2):
  
 @@ -73,7 +73,7 @@
                                         ; FAST_FLOAT workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_float_sse2)
 +       global  EXTN(jsimd_idct_float_sse2) PRIVATE
  
  EXTN(jsimd_idct_float_sse2):
         push    ebp
 Index: simd/jiss2int.asm
 ===================================================================
---- simd/jiss2int.asm   (revision 733)
+--- simd/jiss2int.asm   (revision 829)
 +++ simd/jiss2int.asm   (working copy)
 @@ -66,7 +66,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_islow_sse2)
 +       global  EXTN(jconst_idct_islow_sse2) PRIVATE
  
  EXTN(jconst_idct_islow_sse2):
  
 @@ -105,7 +105,7 @@
  %define WK_NUM         12
  
         align   16
 -       global  EXTN(jsimd_idct_islow_sse2)
 +       global  EXTN(jsimd_idct_islow_sse2) PRIVATE
  
  EXTN(jsimd_idct_islow_sse2):
         push    ebp
 Index: simd/jfsseflt-64.asm
 ===================================================================
---- simd/jfsseflt-64.asm        (revision 733)
+--- simd/jfsseflt-64.asm        (revision 829)
 +++ simd/jfsseflt-64.asm        (working copy)
 @@ -38,7 +38,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_float_sse)
 +       global  EXTN(jconst_fdct_float_sse) PRIVATE
  
  EXTN(jconst_fdct_float_sse):
  
 @@ -65,7 +65,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_float_sse)
 +       global  EXTN(jsimd_fdct_float_sse) PRIVATE
  
  EXTN(jsimd_fdct_float_sse):
         push    rbp
 Index: simd/jccolss2-64.asm
 ===================================================================
---- simd/jccolss2-64.asm        (revision 733)
+--- simd/jccolss2-64.asm        (revision 829)
 +++ simd/jccolss2-64.asm        (working copy)
 @@ -34,7 +34,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_ycc_convert_sse2)
 +       global  EXTN(jconst_rgb_ycc_convert_sse2) PRIVATE
  
  EXTN(jconst_rgb_ycc_convert_sse2):
  
 Index: simd/jcsamss2-64.asm
 ===================================================================
---- simd/jcsamss2-64.asm        (revision 733)
+--- simd/jcsamss2-64.asm        (revision 829)
 +++ simd/jcsamss2-64.asm        (working copy)
 @@ -41,7 +41,7 @@
  ; r15 = JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v1_downsample_sse2)
 +       global  EXTN(jsimd_h2v1_downsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v1_downsample_sse2):
         push    rbp
 @@ -185,7 +185,7 @@
  ; r15 = JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v2_downsample_sse2)
 +       global  EXTN(jsimd_h2v2_downsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_downsample_sse2):
         push    rbp
 Index: simd/jdclrss2-64.asm
 ===================================================================
---- simd/jdclrss2-64.asm        (revision 733)
+--- simd/jdclrss2-64.asm        (revision 829)
 +++ simd/jdclrss2-64.asm        (working copy)
 @@ -39,7 +39,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_ycc_rgb_convert_sse2)
 +       global  EXTN(jsimd_ycc_rgb_convert_sse2) PRIVATE
  
  EXTN(jsimd_ycc_rgb_convert_sse2):
         push    rbp
 Index: simd/jdcolmmx.asm
 ===================================================================
---- simd/jdcolmmx.asm   (revision 733)
+--- simd/jdcolmmx.asm   (revision 829)
 +++ simd/jdcolmmx.asm   (working copy)
 @@ -35,7 +35,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_ycc_rgb_convert_mmx)
 +       global  EXTN(jconst_ycc_rgb_convert_mmx) PRIVATE
  
  EXTN(jconst_ycc_rgb_convert_mmx):
  
 Index: simd/jcclrmmx.asm
 ===================================================================
---- simd/jcclrmmx.asm   (revision 733)
+--- simd/jcclrmmx.asm   (revision 829)
 +++ simd/jcclrmmx.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_rgb_ycc_convert_mmx)
 +       global  EXTN(jsimd_rgb_ycc_convert_mmx) PRIVATE
  
  EXTN(jsimd_rgb_ycc_convert_mmx):
         push    ebp
 Index: simd/jfsseflt.asm
 ===================================================================
---- simd/jfsseflt.asm   (revision 733)
+--- simd/jfsseflt.asm   (revision 829)
 +++ simd/jfsseflt.asm   (working copy)
 @@ -37,7 +37,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_float_sse)
 +       global  EXTN(jconst_fdct_float_sse) PRIVATE
  
  EXTN(jconst_fdct_float_sse):
  
 @@ -65,7 +65,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_float_sse)
 +       global  EXTN(jsimd_fdct_float_sse) PRIVATE
  
  EXTN(jsimd_fdct_float_sse):
         push    ebp
 Index: simd/jdmrgss2-64.asm
 ===================================================================
---- simd/jdmrgss2-64.asm        (revision 733)
+--- simd/jdmrgss2-64.asm        (revision 829)
 +++ simd/jdmrgss2-64.asm        (working copy)
 @@ -39,7 +39,7 @@
  %define WK_NUM         3
  
         align   16
 -       global  EXTN(jsimd_h2v1_merged_upsample_sse2)
 +       global  EXTN(jsimd_h2v1_merged_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v1_merged_upsample_sse2):
         push    rbp
 @@ -543,7 +543,7 @@
  ; r13 = JSAMPARRAY output_buf
  
         align   16
 -       global  EXTN(jsimd_h2v2_merged_upsample_sse2)
 +       global  EXTN(jsimd_h2v2_merged_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_merged_upsample_sse2):
         push    rbp
+Index: simd/jdcolss2.asm
+===================================================================
+--- simd/jdcolss2.asm   (revision 829)
++++ simd/jdcolss2.asm   (working copy)
+@@ -35,7 +35,7 @@
+        SECTION SEG_CONST
+ 
+        alignz  16
+-       global  EXTN(jconst_ycc_rgb_convert_sse2)
++       global  EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
+ 
+ EXTN(jconst_ycc_rgb_convert_sse2):
+ 
 Index: simd/jdmermmx.asm
 ===================================================================
---- simd/jdmermmx.asm   (revision 733)
+--- simd/jdmermmx.asm   (revision 829)
 +++ simd/jdmermmx.asm   (working copy)
 @@ -35,7 +35,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_merged_upsample_mmx)
 +       global  EXTN(jconst_merged_upsample_mmx) PRIVATE
  
  EXTN(jconst_merged_upsample_mmx):
  
-Index: simd/jdcolss2.asm
+Index: simd/jcclrss2.asm
 ===================================================================
---- simd/jdcolss2.asm   (revision 733)
-+++ simd/jdcolss2.asm   (working copy)
-@@ -35,7 +35,7 @@
-        SECTION SEG_CONST
+--- simd/jcclrss2.asm   (revision 829)
++++ simd/jcclrss2.asm   (working copy)
+@@ -38,7 +38,7 @@
  
-        alignz  16
--       global  EXTN(jconst_ycc_rgb_convert_sse2)
-+       global  EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
+        align   16
  
- EXTN(jconst_ycc_rgb_convert_sse2):
+-       global  EXTN(jsimd_rgb_ycc_convert_sse2)
++       global  EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
  
+ EXTN(jsimd_rgb_ycc_convert_sse2):
+        push    ebp
 Index: simd/jiss2red.asm
 ===================================================================
---- simd/jiss2red.asm   (revision 733)
+--- simd/jiss2red.asm   (revision 829)
 +++ simd/jiss2red.asm   (working copy)
 @@ -72,7 +72,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_red_sse2)
 +       global  EXTN(jconst_idct_red_sse2) PRIVATE
  
  EXTN(jconst_idct_red_sse2):
  
 @@ -113,7 +113,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_idct_4x4_sse2)
 +       global  EXTN(jsimd_idct_4x4_sse2) PRIVATE
  
  EXTN(jsimd_idct_4x4_sse2):
         push    ebp
 @@ -424,7 +424,7 @@
  %define output_col(b)  (b)+20          ; JDIMENSION output_col
  
         align   16
 -       global  EXTN(jsimd_idct_2x2_sse2)
 +       global  EXTN(jsimd_idct_2x2_sse2) PRIVATE
  
  EXTN(jsimd_idct_2x2_sse2):
         push    ebp
-Index: simd/jcclrss2.asm
-===================================================================
---- simd/jcclrss2.asm   (revision 733)
-+++ simd/jcclrss2.asm   (working copy)
-@@ -38,7 +38,7 @@
- 
-        align   16
- 
--       global  EXTN(jsimd_rgb_ycc_convert_sse2)
-+       global  EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
- 
- EXTN(jsimd_rgb_ycc_convert_sse2):
-        push    ebp
 Index: simd/jdmerss2.asm
 ===================================================================
---- simd/jdmerss2.asm   (revision 733)
+--- simd/jdmerss2.asm   (revision 829)
 +++ simd/jdmerss2.asm   (working copy)
 @@ -35,7 +35,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_merged_upsample_sse2)
 +       global  EXTN(jconst_merged_upsample_sse2) PRIVATE
  
  EXTN(jconst_merged_upsample_sse2):
  
 Index: simd/jfss2fst-64.asm
 ===================================================================
---- simd/jfss2fst-64.asm        (revision 733)
+--- simd/jfss2fst-64.asm        (revision 829)
 +++ simd/jfss2fst-64.asm        (working copy)
 @@ -53,7 +53,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_fdct_ifast_sse2)
 +       global  EXTN(jconst_fdct_ifast_sse2) PRIVATE
  
  EXTN(jconst_fdct_ifast_sse2):
  
 @@ -80,7 +80,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_ifast_sse2)
 +       global  EXTN(jsimd_fdct_ifast_sse2) PRIVATE
  
  EXTN(jsimd_fdct_ifast_sse2):
         push    rbp
+Index: simd/jcqntmmx.asm
+===================================================================
+--- simd/jcqntmmx.asm   (revision 829)
++++ simd/jcqntmmx.asm   (working copy)
+@@ -35,7 +35,7 @@
+ %define workspace      ebp+16          ; DCTELEM * workspace
+ 
+        align   16
+-       global  EXTN(jsimd_convsamp_mmx)
++       global  EXTN(jsimd_convsamp_mmx) PRIVATE
+ 
+ EXTN(jsimd_convsamp_mmx):
+        push    ebp
+@@ -140,7 +140,7 @@
+ %define workspace      ebp+16          ; DCTELEM * workspace
+ 
+        align   16
+-       global  EXTN(jsimd_quantize_mmx)
++       global  EXTN(jsimd_quantize_mmx) PRIVATE
+ 
+ EXTN(jsimd_quantize_mmx):
+        push    ebp
 Index: simd/jimmxfst.asm
 ===================================================================
---- simd/jimmxfst.asm   (revision 733)
+--- simd/jimmxfst.asm   (revision 829)
 +++ simd/jimmxfst.asm   (working copy)
 @@ -59,7 +59,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_idct_ifast_mmx)
 +       global  EXTN(jconst_idct_ifast_mmx) PRIVATE
  
  EXTN(jconst_idct_ifast_mmx):
  
 @@ -94,7 +94,7 @@
                                         ; JCOEF workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_ifast_mmx)
 +       global  EXTN(jsimd_idct_ifast_mmx) PRIVATE
  
  EXTN(jsimd_idct_ifast_mmx):
         push    ebp
-Index: simd/jcqntmmx.asm
-===================================================================
---- simd/jcqntmmx.asm   (revision 733)
-+++ simd/jcqntmmx.asm   (working copy)
-@@ -35,7 +35,7 @@
- %define workspace      ebp+16          ; DCTELEM * workspace
- 
-        align   16
--       global  EXTN(jsimd_convsamp_mmx)
-+       global  EXTN(jsimd_convsamp_mmx) PRIVATE
- 
- EXTN(jsimd_convsamp_mmx):
-        push    ebp
-@@ -140,7 +140,7 @@
- %define workspace      ebp+16          ; DCTELEM * workspace
- 
-        align   16
--       global  EXTN(jsimd_quantize_mmx)
-+       global  EXTN(jsimd_quantize_mmx) PRIVATE
- 
- EXTN(jsimd_quantize_mmx):
-        push    ebp
 Index: simd/jfss2fst.asm
 ===================================================================
---- simd/jfss2fst.asm   (revision 733)
+--- simd/jfss2fst.asm   (revision 829)
 +++ simd/jfss2fst.asm   (working copy)
 @@ -52,7 +52,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_fdct_ifast_sse2)
 +       global  EXTN(jconst_fdct_ifast_sse2) PRIVATE
  
  EXTN(jconst_fdct_ifast_sse2):
  
 @@ -80,7 +80,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_ifast_sse2)
 +       global  EXTN(jsimd_fdct_ifast_sse2) PRIVATE
  
  EXTN(jsimd_fdct_ifast_sse2):
         push    ebp
 Index: simd/jcgrammx.asm
 ===================================================================
---- simd/jcgrammx.asm   (revision 733)
+--- simd/jcgrammx.asm   (revision 829)
 +++ simd/jcgrammx.asm   (working copy)
 @@ -33,7 +33,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_gray_convert_mmx)
 +       global  EXTN(jconst_rgb_gray_convert_mmx) PRIVATE
  
  EXTN(jconst_rgb_gray_convert_mmx):
  
+Index: simd/jdcolss2-64.asm
+===================================================================
+--- simd/jdcolss2-64.asm        (revision 829)
++++ simd/jdcolss2-64.asm        (working copy)
+@@ -35,7 +35,7 @@
+        SECTION SEG_CONST
+ 
+        alignz  16
+-       global  EXTN(jconst_ycc_rgb_convert_sse2)
++       global  EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
+ 
+ EXTN(jconst_ycc_rgb_convert_sse2):
+ 
 Index: simd/jf3dnflt.asm
 ===================================================================
---- simd/jf3dnflt.asm   (revision 733)
+--- simd/jf3dnflt.asm   (revision 829)
 +++ simd/jf3dnflt.asm   (working copy)
 @@ -27,7 +27,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_float_3dnow)
 +       global  EXTN(jconst_fdct_float_3dnow) PRIVATE
  
  EXTN(jconst_fdct_float_3dnow):
  
 @@ -55,7 +55,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_float_3dnow)
 +       global  EXTN(jsimd_fdct_float_3dnow) PRIVATE
  
  EXTN(jsimd_fdct_float_3dnow):
         push    ebp
-Index: simd/jdcolss2-64.asm
-===================================================================
---- simd/jdcolss2-64.asm        (revision 733)
-+++ simd/jdcolss2-64.asm        (working copy)
-@@ -35,7 +35,7 @@
-        SECTION SEG_CONST
- 
-        alignz  16
--       global  EXTN(jconst_ycc_rgb_convert_sse2)
-+       global  EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
- 
- EXTN(jconst_ycc_rgb_convert_sse2):
- 
 Index: simd/jdsamss2-64.asm
 ===================================================================
---- simd/jdsamss2-64.asm        (revision 733)
+--- simd/jdsamss2-64.asm        (revision 829)
 +++ simd/jdsamss2-64.asm        (working copy)
 @@ -23,7 +23,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fancy_upsample_sse2)
 +       global  EXTN(jconst_fancy_upsample_sse2) PRIVATE
  
  EXTN(jconst_fancy_upsample_sse2):
  
@@ skipping 28 matching lines @@
  ; r13 = JSAMPARRAY * output_data_ptr
  
         align   16
 -       global  EXTN(jsimd_h2v2_upsample_sse2)
 +       global  EXTN(jsimd_h2v2_upsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_upsample_sse2):
         push    rbp
 Index: simd/jcgrass2.asm
 ===================================================================
---- simd/jcgrass2.asm   (revision 733)
+--- simd/jcgrass2.asm   (revision 829)
 +++ simd/jcgrass2.asm   (working copy)
 @@ -30,7 +30,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_gray_convert_sse2)
 +       global  EXTN(jconst_rgb_gray_convert_sse2) PRIVATE
  
  EXTN(jconst_rgb_gray_convert_sse2):
  
 Index: simd/jcsammmx.asm
 ===================================================================
---- simd/jcsammmx.asm   (revision 733)
+--- simd/jcsammmx.asm   (revision 829)
 +++ simd/jcsammmx.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define output_data(b) (b)+28  ; JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v1_downsample_mmx)
 +       global  EXTN(jsimd_h2v1_downsample_mmx) PRIVATE
  
  EXTN(jsimd_h2v1_downsample_mmx):
         push    ebp
 @@ -182,7 +182,7 @@
  %define output_data(b) (b)+28  ; JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v2_downsample_mmx)
 +       global  EXTN(jsimd_h2v2_downsample_mmx) PRIVATE
  
  EXTN(jsimd_h2v2_downsample_mmx):
         push    ebp
+Index: simd/jsimd_i386.c
+===================================================================
+--- simd/jsimd_i386.c   (revision 829)
++++ simd/jsimd_i386.c   (working copy)
+@@ -61,6 +61,7 @@
+     simd_support &= JSIMD_SSE2;
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_rgb_ycc (void)
+ {
+@@ -82,6 +83,7 @@
+ 
+   return 0;
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_rgb_gray (void)
+@@ -127,6 +129,7 @@
+   return 0;
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(void)
+ jsimd_rgb_ycc_convert (j_compress_ptr cinfo,
+                        JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+@@ -179,6 +182,7 @@
+     mmxfct(cinfo->image_width, input_buf,
+         output_buf, output_row, num_rows);
+ }
++#endif
+ 
+ GLOBAL(void)
+ jsimd_rgb_gray_convert (j_compress_ptr cinfo,
+@@ -286,6 +290,7 @@
+         input_row, output_buf, num_rows);
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_h2v2_downsample (void)
+ {
+@@ -351,6 +356,7 @@
+         compptr->v_samp_factor, compptr->width_in_blocks,
+         input_data, output_data);
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_h2v2_upsample (void)
+@@ -636,6 +642,7 @@
+         in_row_group_ctr, output_buf);
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_convsamp (void)
+ {
+@@ -855,6 +862,7 @@
+   else if (simd_support & JSIMD_3DNOW)
+     jsimd_quantize_float_3dnow(coef_block, divisors, workspace);
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_idct_2x2 (void)
+@@ -1045,4 +1053,3 @@
+     jsimd_idct_float_3dnow(compptr->dct_table, coef_block,
+         output_buf, output_col);
+ }
+-
 Index: simd/jcqnts2f-64.asm
 ===================================================================
---- simd/jcqnts2f-64.asm        (revision 733)
+--- simd/jcqnts2f-64.asm        (revision 829)
 +++ simd/jcqnts2f-64.asm        (working copy)
 @@ -36,7 +36,7 @@
  ; r12 = FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_float_sse2)
 +       global  EXTN(jsimd_convsamp_float_sse2) PRIVATE
  
  EXTN(jsimd_convsamp_float_sse2):
         push    rbp
 @@ -110,7 +110,7 @@
  ; r12 = FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_float_sse2)
 +       global  EXTN(jsimd_quantize_float_sse2) PRIVATE
  
  EXTN(jsimd_quantize_float_sse2):
         push    rbp
 Index: simd/jcqnt3dn.asm
 ===================================================================
---- simd/jcqnt3dn.asm   (revision 733)
+--- simd/jcqnt3dn.asm   (revision 829)
 +++ simd/jcqnt3dn.asm   (working copy)
 @@ -35,7 +35,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_float_3dnow)
 +       global  EXTN(jsimd_convsamp_float_3dnow) PRIVATE
  
  EXTN(jsimd_convsamp_float_3dnow):
         push    ebp
 @@ -138,7 +138,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_float_3dnow)
 +       global  EXTN(jsimd_quantize_float_3dnow) PRIVATE
  
  EXTN(jsimd_quantize_float_3dnow):
         push    ebp
 Index: simd/jcsamss2.asm
 ===================================================================
---- simd/jcsamss2.asm   (revision 733)
+--- simd/jcsamss2.asm   (revision 829)
 +++ simd/jcsamss2.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define output_data(b) (b)+28          ; JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v1_downsample_sse2)
 +       global  EXTN(jsimd_h2v1_downsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v1_downsample_sse2):
         push    ebp
 @@ -195,7 +195,7 @@
  %define output_data(b) (b)+28  ; JSAMPARRAY output_data
  
         align   16
 -       global  EXTN(jsimd_h2v2_downsample_sse2)
 +       global  EXTN(jsimd_h2v2_downsample_sse2) PRIVATE
  
  EXTN(jsimd_h2v2_downsample_sse2):
         push    ebp
+Index: simd/jsimd_x86_64.c
+===================================================================
+--- simd/jsimd_x86_64.c (revision 829)
++++ simd/jsimd_x86_64.c (working copy)
+@@ -29,6 +29,7 @@
+ 
+ #define IS_ALIGNED_SSE(ptr) (IS_ALIGNED(ptr, 4)) /* 16 byte alignment */
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_rgb_ycc (void)
+ {
+@@ -45,6 +46,7 @@
+ 
+   return 1;
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_rgb_gray (void)
+@@ -80,6 +82,7 @@
+   return 1;
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(void)
+ jsimd_rgb_ycc_convert (j_compress_ptr cinfo,
+                        JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+@@ -118,6 +121,7 @@
+ 
+   sse2fct(cinfo->image_width, input_buf, output_buf, output_row, num_rows);
+ }
++#endif
+ 
+ GLOBAL(void)
+ jsimd_rgb_gray_convert (j_compress_ptr cinfo,
+@@ -197,6 +201,7 @@
+   sse2fct(cinfo->output_width, input_buf, input_row, output_buf, num_rows);
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_h2v2_downsample (void)
+ {
+@@ -242,6 +247,7 @@
+                              compptr->width_in_blocks,
+                              input_data, output_data);
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_h2v2_upsample (void)
+@@ -451,6 +457,7 @@
+   sse2fct(cinfo->output_width, input_buf, in_row_group_ctr, output_buf);
+ }
+ 
++#ifndef JPEG_DECODE_ONLY
+ GLOBAL(int)
+ jsimd_can_convsamp (void)
+ {
+@@ -601,6 +608,7 @@
+ {
+   jsimd_quantize_float_sse2(coef_block, divisors, workspace);
+ }
++#endif
+ 
+ GLOBAL(int)
+ jsimd_can_idct_2x2 (void)
+@@ -750,4 +758,3 @@
+   jsimd_idct_float_sse2(compptr->dct_table, coef_block,
+                         output_buf, output_col);
+ }
+-
 Index: simd/jimmxint.asm
 ===================================================================
---- simd/jimmxint.asm   (revision 733)
+--- simd/jimmxint.asm   (revision 829)
 +++ simd/jimmxint.asm   (working copy)
 @@ -66,7 +66,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_islow_mmx)
 +       global  EXTN(jconst_idct_islow_mmx) PRIVATE
  
  EXTN(jconst_idct_islow_mmx):
  
 @@ -107,7 +107,7 @@
                                         ; JCOEF workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_islow_mmx)
 +       global  EXTN(jsimd_idct_islow_mmx) PRIVATE
  
  EXTN(jsimd_idct_islow_mmx):
         push    ebp
 Index: simd/jcgrymmx.asm
 ===================================================================
---- simd/jcgrymmx.asm   (revision 733)
+--- simd/jcgrymmx.asm   (revision 829)
 +++ simd/jcgrymmx.asm   (working copy)
 @@ -41,7 +41,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_rgb_gray_convert_mmx)
 +       global  EXTN(jsimd_rgb_gray_convert_mmx) PRIVATE
  
  EXTN(jsimd_rgb_gray_convert_mmx):
         push    ebp
 Index: simd/jfss2int.asm
 ===================================================================
---- simd/jfss2int.asm   (revision 733)
+--- simd/jfss2int.asm   (revision 829)
 +++ simd/jfss2int.asm   (working copy)
 @@ -66,7 +66,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_fdct_islow_sse2)
 +       global  EXTN(jconst_fdct_islow_sse2) PRIVATE
  
  EXTN(jconst_fdct_islow_sse2):
  
 @@ -101,7 +101,7 @@
  %define WK_NUM         6
  
         align   16
 -       global  EXTN(jsimd_fdct_islow_sse2)
 +       global  EXTN(jsimd_fdct_islow_sse2) PRIVATE
  
  EXTN(jsimd_fdct_islow_sse2):
         push    ebp
 Index: simd/jcgryss2.asm
 ===================================================================
---- simd/jcgryss2.asm   (revision 733)
+--- simd/jcgryss2.asm   (revision 829)
 +++ simd/jcgryss2.asm   (working copy)
 @@ -39,7 +39,7 @@
  
         align   16
  
 -       global  EXTN(jsimd_rgb_gray_convert_sse2)
 +       global  EXTN(jsimd_rgb_gray_convert_sse2) PRIVATE
  
  EXTN(jsimd_rgb_gray_convert_sse2):
         push    ebp
 Index: simd/jccolmmx.asm
 ===================================================================
---- simd/jccolmmx.asm   (revision 733)
+--- simd/jccolmmx.asm   (revision 829)
 +++ simd/jccolmmx.asm   (working copy)
 @@ -37,7 +37,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_ycc_convert_mmx)
 +       global  EXTN(jconst_rgb_ycc_convert_mmx) PRIVATE
  
  EXTN(jconst_rgb_ycc_convert_mmx):
  
 Index: simd/jimmxred.asm
 ===================================================================
---- simd/jimmxred.asm   (revision 733)
+--- simd/jimmxred.asm   (revision 829)
 +++ simd/jimmxred.asm   (working copy)
 @@ -72,7 +72,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_red_mmx)
 +       global  EXTN(jconst_idct_red_mmx) PRIVATE
  
  EXTN(jconst_idct_red_mmx):
  
@@ skipping 10 matching lines @@
  %define output_col(b)  (b)+20          ; JDIMENSION output_col
  
         align   16
 -       global  EXTN(jsimd_idct_2x2_mmx)
 +       global  EXTN(jsimd_idct_2x2_mmx) PRIVATE
  
  EXTN(jsimd_idct_2x2_mmx):
         push    ebp
 Index: simd/jsimdext.inc
 ===================================================================
---- simd/jsimdext.inc   (revision 733)
+--- simd/jsimdext.inc   (revision 829)
 +++ simd/jsimdext.inc   (working copy)
 @@ -73,6 +73,9 @@
  ; * *BSD family Unix using elf format
  ; * Unix System V, including Solaris x86, UnixWare and SCO Unix
  
 +; PIC is the default on Linux
 +%define PIC
 +
  ; mark stack as non-executable
  section .note.GNU-stack noalloc noexec nowrite progbits
  
 @@ -375,4 +378,14 @@
  ;
  %include "jsimdcfg.inc"
  
 +; Begin chromium edits
 +%ifdef MACHO ; ----(nasm -fmacho -DMACHO ...)--------
 +%define PRIVATE :private_extern
 +%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
 +%define PRIVATE :hidden
 +%else
 +%define PRIVATE
 +%endif
 +; End chromium edits
 +
  ; --------------------------------------------------------------------------
 Index: simd/jdclrmmx.asm
 ===================================================================
---- simd/jdclrmmx.asm   (revision 733)
+--- simd/jdclrmmx.asm   (revision 829)
 +++ simd/jdclrmmx.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_ycc_rgb_convert_mmx)
 +       global  EXTN(jsimd_ycc_rgb_convert_mmx) PRIVATE
  
  EXTN(jsimd_ycc_rgb_convert_mmx):
         push    ebp
 Index: simd/jccolss2.asm
 ===================================================================
---- simd/jccolss2.asm   (revision 733)
+--- simd/jccolss2.asm   (revision 829)
 +++ simd/jccolss2.asm   (working copy)
 @@ -34,7 +34,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_rgb_ycc_convert_sse2)
 +       global  EXTN(jconst_rgb_ycc_convert_sse2) PRIVATE
  
  EXTN(jconst_rgb_ycc_convert_sse2):
  
 Index: simd/jisseflt.asm
 ===================================================================
---- simd/jisseflt.asm   (revision 733)
+--- simd/jisseflt.asm   (revision 829)
 +++ simd/jisseflt.asm   (working copy)
 @@ -37,7 +37,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_float_sse)
 +       global  EXTN(jconst_idct_float_sse) PRIVATE
  
  EXTN(jconst_idct_float_sse):
  
 @@ -73,7 +73,7 @@
                                         ; FAST_FLOAT workspace[DCTSIZE2]
  
         align   16
 -       global  EXTN(jsimd_idct_float_sse)
 +       global  EXTN(jsimd_idct_float_sse) PRIVATE
  
  EXTN(jsimd_idct_float_sse):
         push    ebp
 Index: simd/jcqnts2i-64.asm
 ===================================================================
---- simd/jcqnts2i-64.asm        (revision 733)
+--- simd/jcqnts2i-64.asm        (revision 829)
 +++ simd/jcqnts2i-64.asm        (working copy)
 @@ -36,7 +36,7 @@
  ; r12 = DCTELEM * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_sse2)
 +       global  EXTN(jsimd_convsamp_sse2) PRIVATE
  
  EXTN(jsimd_convsamp_sse2):
         push    rbp
 @@ -112,7 +112,7 @@
  ; r12 = DCTELEM * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_sse2)
 +       global  EXTN(jsimd_quantize_sse2) PRIVATE
  
  EXTN(jsimd_quantize_sse2):
         push    rbp
 Index: simd/jdclrss2.asm
 ===================================================================
---- simd/jdclrss2.asm   (revision 733)
+--- simd/jdclrss2.asm   (revision 829)
 +++ simd/jdclrss2.asm   (working copy)
 @@ -40,7 +40,7 @@
  %define gotptr         wk(0)-SIZEOF_POINTER    ; void * gotptr
  
         align   16
 -       global  EXTN(jsimd_ycc_rgb_convert_sse2)
 +       global  EXTN(jsimd_ycc_rgb_convert_sse2) PRIVATE
  
  EXTN(jsimd_ycc_rgb_convert_sse2):
         push    ebp
 Index: simd/jcqntsse.asm
 ===================================================================
---- simd/jcqntsse.asm   (revision 733)
+--- simd/jcqntsse.asm   (revision 829)
 +++ simd/jcqntsse.asm   (working copy)
 @@ -35,7 +35,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_convsamp_float_sse)
 +       global  EXTN(jsimd_convsamp_float_sse) PRIVATE
  
  EXTN(jsimd_convsamp_float_sse):
         push    ebp
 @@ -138,7 +138,7 @@
  %define workspace      ebp+16          ; FAST_FLOAT * workspace
  
         align   16
 -       global  EXTN(jsimd_quantize_float_sse)
 +       global  EXTN(jsimd_quantize_float_sse) PRIVATE
  
  EXTN(jsimd_quantize_float_sse):
         push    ebp
 Index: simd/jiss2int-64.asm
 ===================================================================
---- simd/jiss2int-64.asm        (revision 733)
+--- simd/jiss2int-64.asm        (revision 829)
 +++ simd/jiss2int-64.asm        (working copy)
 @@ -67,7 +67,7 @@
         SECTION SEG_CONST
  
         alignz  16
 -       global  EXTN(jconst_idct_islow_sse2)
 +       global  EXTN(jconst_idct_islow_sse2) PRIVATE
  
  EXTN(jconst_idct_islow_sse2):
  
 @@ -106,7 +106,7 @@
  %define WK_NUM         12
  
         align   16
 -       global  EXTN(jsimd_idct_islow_sse2)
 +       global  EXTN(jsimd_idct_islow_sse2) PRIVATE
  
  EXTN(jsimd_idct_islow_sse2):
         push    rbp
 Index: simd/jfmmxfst.asm
 ===================================================================
---- simd/jfmmxfst.asm   (revision 733)
+--- simd/jfmmxfst.asm   (revision 829)
 +++ simd/jfmmxfst.asm   (working copy)
 @@ -52,7 +52,7 @@
  %define CONST_SHIFT     (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
  
         alignz  16
 -       global  EXTN(jconst_fdct_ifast_mmx)
 +       global  EXTN(jconst_fdct_ifast_mmx) PRIVATE
  
  EXTN(jconst_fdct_ifast_mmx):
  
 @@ -80,7 +80,7 @@
  %define WK_NUM         2
  
         align   16
 -       global  EXTN(jsimd_fdct_ifast_mmx)
 +       global  EXTN(jsimd_fdct_ifast_mmx) PRIVATE
  
  EXTN(jsimd_fdct_ifast_mmx):
         push    ebp
 Index: jdarith.c
 ===================================================================
---- jdarith.c   (revision 733)
+--- jdarith.c   (revision 829)
 +++ jdarith.c   (working copy)
 @@ -150,8 +150,8 @@
     */
    sv = *st;
    qe = jpeg_aritab[sv & 0x7F]; /* => Qe_Value */
 -  nl = qe & 0xFF; qe >>= 8;    /* Next_Index_LPS + Switch_MPS */
 -  nm = qe & 0xFF; qe >>= 8;    /* Next_Index_MPS */
 +  nl = (unsigned char) qe & 0xFF; qe >>= 8;    /* Next_Index_LPS + Switch_MPS */
 +  nm = (unsigned char) qe & 0xFF; qe >>= 8;    /* Next_Index_MPS */
  
    /* Decode & estimation procedures per sections D.2.4 & D.2.5 */
    temp = e->a - qe;
 Index: jdhuff.c
 ===================================================================
---- jdhuff.c    (revision 733)
+--- jdhuff.c    (revision 829)
 +++ jdhuff.c    (working copy)
 @@ -742,7 +742,7 @@
   * this module, since we'll just re-assign them on the next call.)
   */
  
 -#define BUFSIZE (DCTSIZE2 * 2)
 +#define BUFSIZE (DCTSIZE2 * 2u)
  
  METHODDEF(boolean)
  decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)