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

Side by Side Diff: build/common.gypi

Issue 140653005: Adds tls_edit utility which patches irt_core.nexe's TLS usage. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: gyp builds with host toolsets should not inherit target flags for arm and mips Created 6 years, 11 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
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 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ], 295 ],
296 'cflags_c': [ 296 'cflags_c': [
297 # Require defining functions as "foo(void)" rather than 297 # Require defining functions as "foo(void)" rather than
298 # "foo()" because, in C (but not C++), the latter 298 # "foo()" because, in C (but not C++), the latter
299 # defines a function with unspecified arguments rather 299 # defines a function with unspecified arguments rather
300 # than no arguments. 300 # than no arguments.
301 '-Wstrict-prototypes', 301 '-Wstrict-prototypes',
302 ], 302 ],
303 }], 303 }],
304 [ 'target_arch=="arm"', { 304 [ 'target_arch=="arm"', {
305 'cflags': [ 305 'target_conditions': [
306 '-Wno-abi', 306 ['_toolset=="target"', {
307 '-fno-exceptions', 307 'cflags': [
308 '-Wall', 308 '-Wno-abi',
309 '-fPIC', 309 '-fno-exceptions',
310 '--sysroot=<(sysroot)', 310 '-Wall',
311 ], 311 '-fPIC',
312 'ldflags': [ 312 '--sysroot=<(sysroot)',
313 '--sysroot=<(sysroot)', 313 ],
314 ], 314 'ldflags': [
315 # TODO(mcgrathr): This is copied from the arm section of 315 '--sysroot=<(sysroot)',
316 # chromium/src/build/common.gypi, but these details really 316 ],
317 # should be more fully harmonized and shared. 317 # TODO(mcgrathr): This is copied from the arm section of
318 'conditions': [ 318 # chromium/src/build/common.gypi, but these details really
319 ['arm_thumb==1', { 319 # should be more fully harmonized and shared.
320 'cflags': [ 320 'conditions': [
321 '-mthumb', 321 ['arm_thumb==1', {
322 ] 322 'cflags': [
323 }], 323 '-mthumb',
324 ['arm_version==7', { 324 ]
325 'cflags': [ 325 }],
326 '-march=armv7-a', 326 ['arm_version==7', {
327 '-mtune=cortex-a9', 327 'cflags': [
328 '-mfloat-abi=<(arm_float_abi)', 328 '-march=armv7-a',
329 ], 329 '-mtune=cortex-a9',
330 'conditions': [ 330 '-mfloat-abi=<(arm_float_abi)',
331 ['arm_neon==1', { 331 ],
332 'cflags': [ '-mfpu=neon', ], 332 'conditions': [
333 }, { 333 ['arm_neon==1', {
334 'cflags': [ '-mfpu=<(arm_fpu)', ], 334 'cflags': [ '-mfpu=neon', ],
335 }] 335 }, {
336 ], 336 'cflags': [ '-mfpu=<(arm_fpu)', ],
337 }], 337 }]
338 ],
339 }],
340 ],
341 }],
338 ], 342 ],
339 }], 343 }],
340 ['target_arch=="mipsel"', { 344 ['target_arch=="mipsel"', {
341 # Copied from chromium build/common.gypi 345 'target_conditions': [
342 'conditions': [ 346 ['_toolset=="target"', {
343 ['mips_arch_variant=="mips32r2"', { 347 # Copied from chromium build/common.gypi
344 'cflags': ['-mips32r2'], 348 'conditions': [
345 }, { 349 ['mips_arch_variant=="mips32r2"', {
346 'cflags': ['-mips32'], 350 'cflags': ['-mips32r2'],
351 }, {
352 'cflags': ['-mips32'],
353 }],
354 ],
347 }], 355 }],
348 ], 356 ],
349 }], 357 }],
350 ['target_arch=="ia32" or target_arch=="x64"', { 358 ['target_arch=="ia32" or target_arch=="x64"', {
351 'conditions': [ 359 'conditions': [
352 ['target_arch=="x64"', { 360 ['target_arch=="x64"', {
353 'variables': { 361 'variables': {
354 'mbits_flag': '-m64', 362 'mbits_flag': '-m64',
355 }, 363 },
356 }, { 364 }, {
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
776 # files to appear (when present) in the UI as actual files and not red 784 # files to appear (when present) in the UI as actual files and not red
777 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
778 # and therefore SYMROOT, needs to be set at the project level. 786 # and therefore SYMROOT, needs to be set at the project level.
779 'SYMROOT': '<(DEPTH)/xcodebuild', 787 'SYMROOT': '<(DEPTH)/xcodebuild',
780 }, 788 },
781 'includes': [ 789 'includes': [
782 'untrusted.gypi', 790 'untrusted.gypi',
783 ], 791 ],
784 } 792 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698