Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 194 'VCCLCompilerTool': { | 194 'VCCLCompilerTool': { |
| 195 'WarnAsError': 'false', | 195 'WarnAsError': 'false', |
| 196 }, | 196 }, |
| 197 }, | 197 }, |
| 198 }], | 198 }], |
| 199 ], | 199 ], |
| 200 }], | 200 }], |
| 201 ], | 201 ], |
| 202 }, | 202 }, |
| 203 'conditions': [ | 203 'conditions': [ |
| 204 ['asan==1', { | 204 ['asan==1 and OS!="mac"', { |
| 205 'target_defaults': { | 205 'target_defaults': { |
| 206 'cflags_cc+': [ | 206 'cflags_cc+': [ |
| 207 '-fno-omit-frame-pointer', | 207 '-fno-omit-frame-pointer', |
| 208 '-gline-tables-only', | 208 '-gline-tables-only', |
| 209 '-fsanitize=address', | 209 '-fsanitize=address', |
| 210 '-w', # http://crbug.com/162783 | 210 '-w', # http://crbug.com/162783 |
| 211 ], | 211 ], |
| 212 'cflags_cc!': [ | |
| 213 '-fomit-frame-pointer', | |
| 214 ], | |
|
Michael Achenbach
2015/01/09 12:42:48
Why remove this? It's still in common.gypi:
https:
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
uh, that's a mistake
| |
| 215 'ldflags': [ | 212 'ldflags': [ |
| 216 '-fsanitize=address', | 213 '-fsanitize=address', |
| 217 ], | 214 ], |
| 218 }, | 215 }, |
| 219 }], | 216 }], |
| 220 ['tsan==1', { | 217 ['tsan==1 and OS!="mac"', { |
| 221 'target_defaults': { | 218 'target_defaults': { |
| 222 'cflags+': [ | 219 'cflags+': [ |
| 223 '-fno-omit-frame-pointer', | 220 '-fno-omit-frame-pointer', |
| 224 '-gline-tables-only', | 221 '-gline-tables-only', |
| 225 '-fsanitize=thread', | 222 '-fsanitize=thread', |
| 226 '-fPIC', | 223 '-fPIC', |
| 227 '-Wno-c++11-extensions', | 224 '-Wno-c++11-extensions', |
| 228 ], | 225 ], |
| 229 'cflags!': [ | 226 'cflags!': [ |
| 230 '-fomit-frame-pointer', | 227 '-fomit-frame-pointer', |
| 231 ], | 228 ], |
| 232 'ldflags': [ | 229 'ldflags': [ |
| 233 '-fsanitize=thread', | 230 '-fsanitize=thread', |
| 234 '-pie', | 231 '-pie', |
| 235 ], | 232 ], |
| 236 'defines': [ | 233 'defines': [ |
| 237 'THREAD_SANITIZER', | 234 'THREAD_SANITIZER', |
| 238 ], | 235 ], |
| 239 }, | 236 }, |
| 240 }], | 237 }], |
| 238 ['asan==1 and OS=="mac"', { | |
| 239 'target_defaults': { | |
| 240 'xcode_settings': { | |
| 241 'OTHER_CFLAGS+': [ | |
|
Michael Achenbach
2015/01/09 12:42:48
Why +?
Why -fno-omit-frame-pointer ?
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
so it gets added to the list?
Michael Achenbach
2015/01/09 12:52:57
OK - I just made a 1:1 comparison with common.gypi
| |
| 242 '-fno-omit-frame-pointer', | |
| 243 '-gline-tables-only', | |
| 244 '-fsanitize=address', | |
| 245 '-w', # http://crbug.com/162783 | |
| 246 ], | |
| 247 }, | |
| 248 'target_conditions': [ | |
| 249 ['_type!="static_library"', { | |
| 250 'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address']}, | |
| 251 }], | |
| 252 ], | |
| 253 'dependencies': [ | |
| 254 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | |
| 255 ], | |
| 256 }, | |
| 257 }], | |
| 258 ['tsan==1 and OS=="mac"', { | |
| 259 'target_defaults': { | |
| 260 'xcode_settings': { | |
| 261 'OTHER_CFLAGS+': [ | |
| 262 '-fno-omit-frame-pointer', | |
| 263 '-gline-tables-only', | |
| 264 '-fsanitize=thread', | |
| 265 '-fPIC', | |
| 266 '-Wno-c++11-extensions', | |
| 267 ], | |
| 268 }, | |
| 269 'target_conditions': [ | |
| 270 ['_type!="static_library"', { | |
| 271 'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address', '-pie']}, | |
| 272 }], | |
| 273 ], | |
| 274 'dependencies': [ | |
| 275 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | |
|
Michael Achenbach
2015/01/09 12:42:48
I don't find the same for tsan in commmon.gypi
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
removed
Michael Achenbach
2015/01/09 12:52:57
Actually, I don't see any tsan related things for
| |
| 276 ], | |
| 277 'defines': [ | |
| 278 'THREAD_SANITIZER', | |
| 279 ], | |
| 280 }, | |
| 281 }], | |
| 241 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 282 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
| 242 or OS=="netbsd"', { | 283 or OS=="netbsd"', { |
| 243 'target_defaults': { | 284 'target_defaults': { |
| 244 'cflags': [ | 285 'cflags': [ |
| 245 '-Wall', | 286 '-Wall', |
| 246 '<(werror)', | 287 '<(werror)', |
| 247 '-W', | 288 '-W', |
| 248 '-Wno-unused-parameter', | 289 '-Wno-unused-parameter', |
| 249 '-Wno-long-long', | 290 '-Wno-long-long', |
| 250 '-pthread', | 291 '-pthread', |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 451 ], | 492 ], |
| 452 }], | 493 }], |
| 453 ['clang==1 and OS=="win"', { | 494 ['clang==1 and OS=="win"', { |
| 454 'make_global_settings': [ | 495 'make_global_settings': [ |
| 455 # On Windows, gyp's ninja generator only looks at CC. | 496 # On Windows, gyp's ninja generator only looks at CC. |
| 456 ['CC', '<(make_clang_dir)/bin/clang-cl'], | 497 ['CC', '<(make_clang_dir)/bin/clang-cl'], |
| 457 ], | 498 ], |
| 458 }], | 499 }], |
| 459 ], | 500 ], |
| 460 } | 501 } |
| OLD | NEW |