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

Side by Side Diff: third_party/zlib/zlib.gyp

Issue 705053002: Enable zlib SIMD optimisations on Mac OS X builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep disabled on ios; initialise symbols so we're in the BSS Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « third_party/zlib/x86.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name' : 'zlib_x86_simd', 8 'target_name' : 'zlib_x86_simd',
9 'type': 'static_library', 9 'type': 'static_library',
10 'conditions': [ 10 'conditions': [
11 # See http://crbug.com/420616 gyp on mac & ios doesn't apply cflags 11 ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
12 ['OS!="ios" and OS!="mac" and (target_arch=="ia32" or target_arch=="x64" )', {
13 'cflags' : ["-msse2", "-msse4.2", "-mpclmul"], 12 'cflags' : ["-msse2", "-msse4.2", "-mpclmul"],
13 'xcode_settings' : {
14 'OTHER_CFLAGS' : ["-msse4.2", "-mpclmul"],
15 },
14 'sources' : [ 'crc_folding.c', 16 'sources' : [ 'crc_folding.c',
15 'fill_window_sse.c'] 17 'fill_window_sse.c']
16 }, { 18 }, {
17 'sources' : [ 'simd_stub.c' ], 19 'sources' : [ 'simd_stub.c' ],
18 }], ['OS=="android"', { 20 }], ['OS=="android"', {
19 'toolsets': ['target', 'host'], 21 'toolsets': ['target', 'host'],
20 }], 22 }],
21 ], 23 ],
22 }, 24 },
23 { 25 {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 ], 60 ],
59 'include_dirs': [ 61 'include_dirs': [
60 '.', 62 '.',
61 ], 63 ],
62 'direct_dependent_settings': { 64 'direct_dependent_settings': {
63 'include_dirs': [ 65 'include_dirs': [
64 '.', 66 '.',
65 ], 67 ],
66 }, 68 },
67 'conditions': [ 69 'conditions': [
68 ['OS!="ios" and OS!="mac" and (target_arch=="ia32" or target_arch=="x64" )', { 70 ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
69 'sources' : [ 'x86.c', ], 71 'sources' : [ 'x86.c', ],
70 }], 72 }],
71 ['OS!="win"', { 73 ['OS!="win"', {
72 'product_name': 'chrome_zlib', 74 'product_name': 'chrome_zlib',
73 }], ['OS=="android"', { 75 }], ['OS=="android"', {
74 'toolsets': ['target', 'host'], 76 'toolsets': ['target', 'host'],
75 }], 77 }],
76 ], 78 ],
77 }, 79 },
78 { 80 {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 # fseeko64. We use fopen, ftell, and fseek instead on these 122 # fseeko64. We use fopen, ftell, and fseek instead on these
121 # systems. 123 # systems.
122 'defines': [ 124 'defines': [
123 'USE_FILE32API' 125 'USE_FILE32API'
124 ], 126 ],
125 }], 127 }],
126 ], 128 ],
127 }, 129 },
128 ], 130 ],
129 } 131 }
OLDNEW
« no previous file with comments | « third_party/zlib/x86.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698