| OLD | NEW |
| 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 # This GYP file defines untrusted (NaCl) targets. All targets in this | 5 # This GYP file defines untrusted (NaCl) targets. All targets in this |
| 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid | 6 # file should be conditionally depended upon via 'disable_nacl!=1' to avoid |
| 7 # requiring NaCl sources for building. | 7 # requiring NaCl sources for building. |
| 8 | 8 |
| 9 { | 9 { |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 }, | 55 }, |
| 56 { | 56 { |
| 57 'target_name': 'ppapi_nacl_tests', | 57 'target_name': 'ppapi_nacl_tests', |
| 58 'type': 'none', | 58 'type': 'none', |
| 59 'dependencies': [ | 59 'dependencies': [ |
| 60 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | 60 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
| 61 'ppapi_cpp_lib', | 61 'ppapi_cpp_lib', |
| 62 'native_client/native_client.gyp:ppapi_lib', | 62 'native_client/native_client.gyp:ppapi_lib', |
| 63 ], | 63 ], |
| 64 'variables': { | 64 'variables': { |
| 65 # This is user code (vs IRT code), so tls accesses do not |
| 66 # need to be indirect through a function call. |
| 67 'newlib_tls_flags=': [], |
| 65 # TODO(bradnelson): Remove this compile flag once new nacl_rev is | 68 # TODO(bradnelson): Remove this compile flag once new nacl_rev is |
| 66 # above 9362. | 69 # above 9362. |
| 67 'compile_flags': [ | 70 'compile_flags': [ |
| 68 '-DGL_GLEXT_PROTOTYPES', | 71 '-DGL_GLEXT_PROTOTYPES', |
| 69 ], | 72 ], |
| 70 # Speed up pnacl linking by not generating debug info for tests. | 73 # Speed up pnacl linking by not generating debug info for tests. |
| 71 # We compile with --strip-all under extra_args so debug info is | 74 # We compile with --strip-all under extra_args so debug info is |
| 72 # discarded anyway. Remove this and the --strip-all flag if | 75 # discarded anyway. Remove this and the --strip-all flag if |
| 73 # debug info is really needed. | 76 # debug info is really needed. |
| 74 'compile_flags!': [ | 77 'compile_flags!': [ |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 ], | 125 ], |
| 123 'sources': [ | 126 'sources': [ |
| 124 '<@(test_common_source_files)', | 127 '<@(test_common_source_files)', |
| 125 '<@(test_nacl_source_files)', | 128 '<@(test_nacl_source_files)', |
| 126 ], | 129 ], |
| 127 'extra_args': [ | 130 'extra_args': [ |
| 128 '--strip-all', | 131 '--strip-all', |
| 129 ], | 132 ], |
| 130 }, | 133 }, |
| 131 'conditions': [ | 134 'conditions': [ |
| 132 ['target_arch!="arm"', { | |
| 133 # This is user code (vs IRT code), so tls accesses do not | |
| 134 # need to be indirect through a function call. | |
| 135 # For PNaCl, the -mtls-use-call flag is localized to the | |
| 136 # IRT's translation command, so it is unnecessary to | |
| 137 # counteract that flag here. | |
| 138 'variables': { | |
| 139 'gcc_compile_flags': [ | |
| 140 '-mno-tls-use-call', | |
| 141 ], | |
| 142 }, | |
| 143 }], | |
| 144 ['target_arch!="arm" and disable_glibc==0', { | 135 ['target_arch!="arm" and disable_glibc==0', { |
| 145 'variables': { | 136 'variables': { |
| 146 'build_glibc': 1, | 137 'build_glibc': 1, |
| 147 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which | 138 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which |
| 148 # doesn't work on Windows. | 139 # doesn't work on Windows. |
| 149 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', | 140 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', |
| 150 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', | 141 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', |
| 151 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', | 142 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', |
| 152 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', | 143 'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf', |
| 153 }, | 144 }, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 '>@(_inputs)', | 217 '>@(_inputs)', |
| 227 '--output=>(nmf_pnacl)', | 218 '--output=>(nmf_pnacl)', |
| 228 ], | 219 ], |
| 229 }, | 220 }, |
| 230 ], | 221 ], |
| 231 }], | 222 }], |
| 232 ], | 223 ], |
| 233 }, | 224 }, |
| 234 ], | 225 ], |
| 235 } | 226 } |
| OLD | NEW |