[zlib] Fix unmangled symbols.

third_party/zlib/simd.patch

 diff --git a/third_party/zlib/crc32.c b/third_party/zlib/crc32.c
 index 979a719..09228ed 100644
 --- a/third_party/zlib/crc32.c
 +++ b/third_party/zlib/crc32.c
 @@ -28,6 +28,8 @@
  #  endif /* !DYNAMIC_CRC_TABLE */
  #endif /* MAKECRCH */
  
 +#include "deflate.h"
 +#include "x86.h"
@@ skipping 1161 matching lines @@
 +                          x86_cpu_has_sse42 &&
 +                          x86_cpu_has_pclmulqdq;
 +    return TRUE;
 +}
 +#endif  /* _MSC_VER */
 diff --git a/third_party/zlib/x86.h b/third_party/zlib/x86.h
 new file mode 100644
 index 0000000..ac3d180
 --- /dev/null
 +++ b/third_party/zlib/x86.h
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,15 @@
 +/* x86.h -- check for x86 CPU features
 +* Copyright (C) 2013 Intel Corporation Jim Kukunas
 +* For conditions of distribution and use, see copyright notice in zlib.h
 +*/
 +
 +#ifndef X86_H
 +#define X86_H
 +
++#include "zlib.h"
++
 +extern int x86_cpu_enable_simd;
 +
 +void x86_check_features(void);
 +
 +#endif  /* X86_H */
--- 
+diff --git a/third_party/zlib/mozzconf.h b/third_party/zlib/mozzconf.h
+index 06918bc..10aca44 100644
+--- a/third_party/zlib/mozzconf.h
++++ b/third_party/zlib/mozzconf.h
+@@ -169,6 +169,14 @@
+ #define inflateResetKeep MOZ_Z_inflateResetKeep
+ #define gzopen_w MOZ_Z_gzopen_w
+
++/* Chromium-specific modifications */
++#define copy_with_crc MOZ_Z__copy_with_crc
++#define crc_finalize MOZ_Z__crc_finalize
++#define crc_reset MOZ_Z__crc_reset
++// read_buf used to be local, but this was changed in simd.patch.
++#define read_buf MOZ_Z__read_buf
++#define x86_check_features MOZ_Z__x86_check_features
++
+ /* Mangle Byte types except on Mac. */
+ #if !defined(__MACTYPES__)
+ #define Byte MOZ_Z_Byte
+--
 2.7.4