| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'variables': { | 7 'variables': { |
| 8 # Enable -Werror by default, but put it in a variable so it can | 8 # Enable -Werror by default, but put it in a variable so it can |
| 9 # be optionally disabled. | 9 # be optionally disabled. |
| 10 'werror%': '-Werror', | 10 'werror%': '-Werror', |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 'tc_include_dir_glibc': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include', | 103 'tc_include_dir_glibc': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include', |
| 104 'extra_deps': [], | 104 'extra_deps': [], |
| 105 'extra_deps_newlib64': [], | 105 'extra_deps_newlib64': [], |
| 106 'extra_deps_newlib32': [], | 106 'extra_deps_newlib32': [], |
| 107 'extra_deps_glibc64': [], | 107 'extra_deps_glibc64': [], |
| 108 'extra_deps_glibc32': [], | 108 'extra_deps_glibc32': [], |
| 109 'extra_deps_newlib32_nonsfi': [], | 109 'extra_deps_newlib32_nonsfi': [], |
| 110 'include_dirs': ['<(DEPTH)'], | 110 'include_dirs': ['<(DEPTH)'], |
| 111 'defines': [ | 111 'defines': [ |
| 112 '<@(nacl_default_defines)', | 112 '<@(nacl_default_defines)', |
| 113 'NACL_BUILD_ARCH=x86', | |
| 114 ], | 113 ], |
| 115 'sources': [], | 114 'sources': [], |
| 116 'link_flags': [], | 115 'link_flags': [], |
| 117 # X86-32 IRT needs to be callable with an under-aligned stack so we | 116 # X86-32 IRT needs to be callable with an under-aligned stack so we |
| 118 # disable SSE instructions, which can fault on misaligned addresses: | 117 # disable SSE instructions, which can fault on misaligned addresses: |
| 119 # see https://code.google.com/p/nativeclient/issues/detail?id=3935 | 118 # see https://code.google.com/p/nativeclient/issues/detail?id=3935 |
| 120 'irt_flags_x86_32': '-Wt,-mattr=-sse', | 119 'irt_flags_x86_32': '-Wt,-mattr=-sse', |
| 121 }, | 120 }, |
| 122 }, | 121 }, |
| 123 }], | 122 }], |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)
_x86/nacl_arm_newlib', | 155 'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)
_x86/nacl_arm_newlib', |
| 157 'tc_lib_dir_bionic_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/libarm'
, | 156 'tc_lib_dir_bionic_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/libarm'
, |
| 158 'tc_lib_dir_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm'
, | 157 'tc_lib_dir_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm'
, |
| 159 'tc_lib_dir_irt_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libarm', | 158 'tc_lib_dir_irt_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libarm', |
| 160 'tc_lib_dir_nonsfi_helper_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_nonsfi_
helper/libarm', | 159 'tc_lib_dir_nonsfi_helper_arm': '<(SHARED_INTERMEDIATE_DIR)/tc_nonsfi_
helper/libarm', |
| 161 'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include
', | 160 'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include
', |
| 162 'tc_include_dir_bionic': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/include
', | 161 'tc_include_dir_bionic': '<(SHARED_INTERMEDIATE_DIR)/tc_bionic/include
', |
| 163 'include_dirs': ['<(DEPTH)'], | 162 'include_dirs': ['<(DEPTH)'], |
| 164 'defines': [ | 163 'defines': [ |
| 165 '<@(nacl_default_defines)', | 164 '<@(nacl_default_defines)', |
| 166 'NACL_BUILD_ARCH=arm', | |
| 167 ], | 165 ], |
| 168 'sources': [], | 166 'sources': [], |
| 169 'link_flags': [], | 167 'link_flags': [], |
| 170 }, | 168 }, |
| 171 }, | 169 }, |
| 172 }], | 170 }], |
| 173 ['target_arch=="mipsel"', { | 171 ['target_arch=="mipsel"', { |
| 174 # Common defaults for all mips pnacl-clang targets | 172 # Common defaults for all mips pnacl-clang targets |
| 175 'target_defaults': { | 173 'target_defaults': { |
| 176 'defines': [], | 174 'defines': [], |
| (...skipping 22 matching lines...) Expand all Loading... |
| 199 'extra_deps_newlib_mips': [], | 197 'extra_deps_newlib_mips': [], |
| 200 'native_sources': [], | 198 'native_sources': [], |
| 201 'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_
x86/nacl_mips_glibc', | 199 'nacl_glibc_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_
x86/nacl_mips_glibc', |
| 202 'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)
_x86/nacl_mips_newlib', | 200 'nacl_newlib_tc_root': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)
_x86/nacl_mips_newlib', |
| 203 'tc_lib_dir_newlib_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libmip
s', | 201 'tc_lib_dir_newlib_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libmip
s', |
| 204 'tc_lib_dir_irt_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libmips', | 202 'tc_lib_dir_irt_mips': '<(SHARED_INTERMEDIATE_DIR)/tc_irt/libmips', |
| 205 'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include
', | 203 'tc_include_dir_newlib': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include
', |
| 206 'include_dirs': ['<(DEPTH)'], | 204 'include_dirs': ['<(DEPTH)'], |
| 207 'defines': [ | 205 'defines': [ |
| 208 '<@(nacl_default_defines)', | 206 '<@(nacl_default_defines)', |
| 209 'NACL_BUILD_ARCH=mips', | |
| 210 ], | 207 ], |
| 211 'sources': [], | 208 'sources': [], |
| 212 'link_flags': [], | 209 'link_flags': [], |
| 213 }, | 210 }, |
| 214 }, | 211 }, |
| 215 }], | 212 }], |
| 216 ['target_arch=="ia32" or target_arch=="x64"', { | 213 ['target_arch=="ia32" or target_arch=="x64"', { |
| 217 'target_defaults': { | 214 'target_defaults': { |
| 218 # x86-64 newlib nexe action | 215 # x86-64 newlib nexe action |
| 219 'target_conditions': [ | 216 'target_conditions': [ |
| (...skipping 1571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1791 ], | 1788 ], |
| 1792 }, | 1789 }, |
| 1793 ], | 1790 ], |
| 1794 }], | 1791 }], |
| 1795 ], | 1792 ], |
| 1796 }], # end MIPS | 1793 }], # end MIPS |
| 1797 # end pnacl actions for building ABI-biased native libraries | 1794 # end pnacl actions for building ABI-biased native libraries |
| 1798 ], # end conditions for pnacl biased nlib | 1795 ], # end conditions for pnacl biased nlib |
| 1799 }, | 1796 }, |
| 1800 } | 1797 } |
| OLD | NEW |