Integrate SIMD optimisations for zlib

third_party/zlib/zlib.gyp

Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index aef41ac2bd969dedff9e8f44ec821e8dddc357fb..23acbad6dfff0604546c21a92102455f43cffb84 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -5,6 +5,20 @@
 {
   'targets': [
     {
+      'target_name' : 'zlib_x86_simd',
+      'type': 'static_library',
+      'conditions': [
+        # See http://crbug.com/420616 gyp on Mac doesn't seem to apply cflgags
+        ['OS!="mac" and (target_arch=="ia32" or target_arch=="x64")', {
+          'cflags' : ["-msse2", "-msse4.2", "-mpclmul"],
+          'sources' : [ 'crc_folding.c',
+                        'fill_window_sse.c']
+        }, {
+          'sources' : [ 'simd_stub.c' ],
+        }],
+      ],
+    },
+    {
       'target_name': 'zlib',
       'type': 'static_library',
       'sources': [
@@ -31,11 +45,15 @@
         'trees.c',
         'trees.h',
         'uncompr.c',
+        'x86.h',
         'zconf.h',
         'zlib.h',
         'zutil.c',
         'zutil.h',
       ],
+      'dependencies' : [
+        'zlib_x86_simd'
+      ],
       'include_dirs': [
         '.',
       ],
@@ -43,8 +61,18 @@
         'include_dirs': [
           '.',
         ],
+        'conditions': [
+          ['OS!="mac" and (target_arch=="ia32" or target_arch=="x64")', {
+            'defines': [
+              'ZLIB_X86_SIMD',
+            ],
+          }],
+        ],
       },
       'conditions': [
+        ['OS!="mac" and (target_arch=="ia32" or target_arch=="x64")', {
+          'sources' : [ 'x86.c', ],
+        }],
         ['OS!="win"', {
           'product_name': 'chrome_zlib',
         }], ['OS=="android"', {