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

Side by Side Diff: libjpeg.gyp

Issue 9533003: libjpeg_turbo: Filter out "section flags ignored on section redeclaration" warnings on mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | yasm-filter.sh » ('j') | 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 'variables': { 6 'variables': {
7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
8 'conditions': [ 8 'conditions': [
9 [ 'chromeos == 1 or (os_posix == 1 and \ 9 [ 'chromeos == 1 or (os_posix == 1 and \
10 OS != "mac" and OS != "linux" and OS != "android")', { 10 OS != "mac" and OS != "linux" and OS != "android")', {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 # <http://www.tortall.net/projects/yasm/ticket/236>. 186 # <http://www.tortall.net/projects/yasm/ticket/236>.
187 [ 'OS=="win"', { 187 [ 'OS=="win"', {
188 'variables': { 188 'variables': {
189 'yasm_path': '../yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)', 189 'yasm_path': '../yasm/binaries/win/yasm<(EXECUTABLE_SUFFIX)',
190 'yasm_format': '-fwin32', 190 'yasm_format': '-fwin32',
191 'yasm_flags': [ 191 'yasm_flags': [
192 '-DWIN32', 192 '-DWIN32',
193 '-DMSVC', 193 '-DMSVC',
194 '-Iwin/' 194 '-Iwin/'
195 ], 195 ],
196 'yasm_output_filter': [],
196 }, 197 },
197 }], 198 }],
198 [ 'OS=="mac"', { 199 [ 'OS=="mac"', {
199 'dependencies': [ 200 'dependencies': [
200 '../yasm/yasm.gyp:yasm#host', 201 '../yasm/yasm.gyp:yasm#host',
201 ], 202 ],
202 'variables': { 203 'variables': {
203 'yasm_path': '<(PRODUCT_DIR)/yasm', 204 'yasm_path': '<(PRODUCT_DIR)/yasm',
204 'yasm_format': '-fmacho', 205 'yasm_format': '-fmacho',
205 'yasm_flags': [ 206 'yasm_flags': [
206 '-DMACHO', 207 '-DMACHO',
207 '-Imac/' 208 '-Imac/'
208 ], 209 ],
210 # On Mac, jsimdext.inc contains a "SECTION SEG_CONST". This file
211 # is included by all .asm file, and most files contain another
212 # "SECTION SEG_CONST". SEG_CONST is ".rodata align=16" on mac,
213 # which leads to
214 # "warning: section flags ignored on section redeclaration"
215 # warnings on all .asm files. This script filters out this
216 # warning.
217 'yasm_output_filter': ['./yasm-filter.sh'],
209 }, 218 },
210 }], 219 }],
211 [ 'OS=="linux"', { 220 [ 'OS=="linux"', {
212 'conditions': [ 221 'conditions': [
213 [ 'use_system_yasm==0', { 222 [ 'use_system_yasm==0', {
214 'dependencies': [ 223 'dependencies': [
215 '../yasm/yasm.gyp:yasm#host', 224 '../yasm/yasm.gyp:yasm#host',
216 ], 225 ],
217 }], 226 }],
218 ], 227 ],
(...skipping 13 matching lines...) Expand all
232 '-Ilinux/' 241 '-Ilinux/'
233 ], 242 ],
234 }, { 243 }, {
235 'yasm_format': '-felf64', 244 'yasm_format': '-felf64',
236 'yasm_flag': '-D__x86_64__', 245 'yasm_flag': '-D__x86_64__',
237 'yasm_flags': [ 246 'yasm_flags': [
238 '-D__x86_64__', 247 '-D__x86_64__',
239 '-DELF', 248 '-DELF',
240 '-Ilinux/' 249 '-Ilinux/'
241 ], 250 ],
251 'yasm_output_filter': [],
242 }], 252 }],
243 ], 253 ],
244 }, 254 },
245 }], 255 }],
246 ], 256 ],
247 'rules': [ 257 'rules': [
248 { 258 {
249 'rule_name': 'assemble', 259 'rule_name': 'assemble',
250 'extension': 'asm', 260 'extension': 'asm',
251 'conditions': [ 261 'conditions': [
252 [ 'target_arch!="arm"', { 262 [ 'target_arch!="arm"', {
253 'inputs': [ '<(yasm_path)', ], 263 'inputs': [ '<(yasm_path)', ],
254 'outputs': [ 264 'outputs': [
255 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix) ', 265 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix) ',
256 ], 266 ],
257 'action': [ 267 'action': [
268 '<@(yasm_output_filter)',
258 '<(yasm_path)', 269 '<(yasm_path)',
259 '<(yasm_format)', 270 '<(yasm_format)',
260 '<@(yasm_flags)', 271 '<@(yasm_flags)',
261 '-DRGBX_FILLER_0XFF', 272 '-DRGBX_FILLER_0XFF',
262 '-DSTRICT_MEMORY_ACCESS', 273 '-DSTRICT_MEMORY_ACCESS',
263 '-Isimd/', 274 '-Isimd/',
264 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_s uffix)', 275 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_s uffix)',
265 '<(RULE_INPUT_PATH)', 276 '<(RULE_INPUT_PATH)',
266 ], 277 ],
267 'process_outputs_as_sources': 1, 278 'process_outputs_as_sources': 1,
(...skipping 23 matching lines...) Expand all
291 ], 302 ],
292 }], 303 }],
293 ], 304 ],
294 } 305 }
295 306
296 # Local Variables: 307 # Local Variables:
297 # tab-width:2 308 # tab-width:2
298 # indent-tabs-mode:nil 309 # indent-tabs-mode:nil
299 # End: 310 # End:
300 # vim: set expandtab tabstop=2 shiftwidth=2: 311 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | yasm-filter.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698