| OLD | NEW |
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 The Native Client 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 'includes': [ | 6 'includes': [ |
| 7 '../../../../build/common.gypi', | 7 '../../../../build/common.gypi', |
| 8 ], | 8 ], |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['target_arch=="x64"', { | 10 ['target_arch=="x64"', { |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 # to remove -f* flags, just in case some system's compiler | 77 # to remove -f* flags, just in case some system's compiler |
| 78 # defaults to using PIC for everything. | 78 # defaults to using PIC for everything. |
| 79 '-fno-pic', '-fno-PIC', | 79 '-fno-pic', '-fno-PIC', |
| 80 '-fno-pie', '-fno-PIE', | 80 '-fno-pie', '-fno-PIE', |
| 81 ], | 81 ], |
| 82 'cflags!': [ | 82 'cflags!': [ |
| 83 # TODO(glider): -fasan is deprecated. | 83 # TODO(glider): -fasan is deprecated. |
| 84 '-fasan', | 84 '-fasan', |
| 85 '-faddress-sanitizer', | 85 '-faddress-sanitizer', |
| 86 '-w', | 86 '-w', |
| 87 # We filter these out because release_extra_cflags or another |
| 88 # such thing might be adding them in, and those options wind up |
| 89 # coming after the -fno-stack-protector we added above. |
| 90 '-fstack-protector', |
| 91 '-fstack-protector-all', |
| 87 ], | 92 ], |
| 88 'conditions': [ | 93 'conditions': [ |
| 89 ['clang==1', { | 94 ['clang==1', { |
| 90 'cflags': [ | 95 'cflags': [ |
| 91 # Prevent llvm-opt from replacing my_bzero with a call | 96 # Prevent llvm-opt from replacing my_bzero with a call |
| 92 # to memset | 97 # to memset |
| 93 '-ffreestanding', | 98 '-ffreestanding', |
| 94 # But make its <limits.h> still work! | 99 # But make its <limits.h> still work! |
| 95 '-U__STDC_HOSTED__', '-D__STDC_HOSTED__=1', | 100 '-U__STDC_HOSTED__', '-D__STDC_HOSTED__=1', |
| 96 ], | 101 ], |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 'inputs': ['nacl_bootstrap_munge_phdr.py', | 179 'inputs': ['nacl_bootstrap_munge_phdr.py', |
| 175 '<(PRODUCT_DIR)/nacl_bootstrap_munge_phdr', | 180 '<(PRODUCT_DIR)/nacl_bootstrap_munge_phdr', |
| 176 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], | 181 '<(PRODUCT_DIR)/nacl_bootstrap_raw'], |
| 177 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], | 182 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], |
| 178 'message': 'Munging ELF program header', | 183 'message': 'Munging ELF program header', |
| 179 'action': ['python', '<@(_inputs)', '<@(_outputs)'] | 184 'action': ['python', '<@(_inputs)', '<@(_outputs)'] |
| 180 }], | 185 }], |
| 181 }, | 186 }, |
| 182 ], | 187 ], |
| 183 } | 188 } |
| OLD | NEW |