Chromium Code Reviews| Index: build/common.gypi |
| =================================================================== |
| --- build/common.gypi (revision 111144) |
| +++ build/common.gypi (working copy) |
| @@ -1460,7 +1460,7 @@ |
| 'NDEBUG', |
| ], |
| 'xcode_settings': { |
| - 'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
| + 'DEAD_CODE_STRIPPING': 'NO', # -Wl,-dead_strip |
|
Ryan Sleevi
2011/11/25 07:04:58
Did you mean to change this both here and on 2328?
|
| 'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
| 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], |
| }, |
| @@ -1920,17 +1920,17 @@ |
| ['asan==1', { |
| # Only in the linux section for now, since ASAN doesn't |
| # work on Mac yet. |
| - # TODO(glider): -fasan is deprecated. Remove it when we stop using |
| - # it. |
| + # TODO(glider): -fasan is deprecated. Remove it when we stop using |
| + # it. |
| 'cflags': [ |
| '-fasan', |
| - '-faddress-sanitizer', |
| + '-faddress-sanitizer', |
| '-w', |
| - '-DADDRESS_SANITIZER', |
| + '-DADDRESS_SANITIZER', |
| ], |
| 'ldflags': [ |
| '-fasan', |
| - '-faddress-sanitizer', |
| + '-faddress-sanitizer', |
| ], |
| }], |
| ['no_strict_aliasing==1', { |
| @@ -2324,8 +2324,34 @@ |
| 'asan_saves_file': 'asan.saves', |
| }, |
| 'xcode_settings': { |
| - 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)' |
| + 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)', |
| + 'DEAD_CODE_STRIPPING': 'NO', # -Wl,-dead_strip |
| + 'OTHER_CFLAGS': [ |
| + '-fasan', |
| + '-faddress-sanitizer', |
| + '-w', |
| + ], |
| + 'OTHER_LDFLAGS': [ |
| + '-fasan', |
| + '-faddress-sanitizer', |
| + # The symbols below are referenced in the ASan runtime |
| + # library (compiled on OS X 10.6), but may be unavailable |
| + # on the prior OS X versions. Because Chromium is currently |
| + # targeting 10.5.0, we need to explicitly mark these |
| + # symbols as dynamic_lookup. |
| + '-Wl,-U,_malloc_default_purgeable_zone', |
| + '-Wl,-U,_malloc_zone_memalign', |
| + '-Wl,-U,_dispatch_sync_f', |
| + '-Wl,-U,_dispatch_async_f', |
| + '-Wl,-U,_dispatch_barrier_async_f', |
| + '-Wl,-U,_dispatch_group_async_f', |
| + '-Wl,-U,_dispatch_after_f', |
| + |
| + ], |
| }, |
| + 'defines': [ |
| + 'ADDRESS_SANITIZER', |
| + ], |
| }], |
| ], |
| 'target_conditions': [ |