Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1238)

Unified Diff: third_party/zlib/simd.patch

Issue 2121343002: [zlib] Fix unmangled symbols. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify .patch files to reflect current condition Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/zlib/mozzconf.h ('k') | third_party/zlib/x86.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/simd.patch
diff --git a/third_party/zlib/simd.patch b/third_party/zlib/simd.patch
index 5007b58f1adf3c32b9fb0b68b367be756e60c0f4..0e0a7712a3a905b88cdedab034b64f4d035b8756 100644
--- a/third_party/zlib/simd.patch
+++ b/third_party/zlib/simd.patch
@@ -1179,7 +1179,7 @@ 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
@@ -1188,11 +1188,32 @@ index 0000000..ac3d180
+#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
« no previous file with comments | « third_party/zlib/mozzconf.h ('k') | third_party/zlib/x86.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698