Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: build/common.gypi

Issue 883253003: Add the mips_dsp_rev build variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add the mips_float_abi and mips_fpu_mode build variables. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 'sysroot%': '', 177 'sysroot%': '',
178 'chroot_cmd%': '', 178 'chroot_cmd%': '',
179 179
180 # The system libdir used for this ABI. 180 # The system libdir used for this ABI.
181 'system_libdir%': 'lib', 181 'system_libdir%': 'lib',
182 182
183 # Default MIPS arch variant. This is set in the conditions block 183 # Default MIPS arch variant. This is set in the conditions block
184 # below for MIPS targets. 184 # below for MIPS targets.
185 'mips_arch_variant%': '', 185 'mips_arch_variant%': '',
186 186
187 # MIPS DSP ASE revision. Possible values are:
188 # 0: unavailable
189 # 1: revision 1
190 # 2: revision 2
191 # Default: 0.
192 'mips_dsp_rev%': 0,
193
187 'conditions': [ 194 'conditions': [
188 # Ash needs Aura. 195 # Ash needs Aura.
189 ['use_aura==0', { 196 ['use_aura==0', {
190 'use_ash%': 0, 197 'use_ash%': 0,
191 }], 198 }],
192 199
193 # Set default value of toolkit_views based on OS. 200 # Set default value of toolkit_views based on OS.
194 ['OS=="win" or chromeos==1 or use_aura==1', { 201 ['OS=="win" or chromeos==1 or use_aura==1', {
195 'toolkit_views%': 1, 202 'toolkit_views%': 1,
196 }, { 203 }, {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 ], 276 ],
270 }, 277 },
271 278
272 # Copy conditionally-set variables out one scope. 279 # Copy conditionally-set variables out one scope.
273 'chromeos%': '<(chromeos)', 280 'chromeos%': '<(chromeos)',
274 'chromecast%': '<(chromecast)', 281 'chromecast%': '<(chromecast)',
275 'host_arch%': '<(host_arch)', 282 'host_arch%': '<(host_arch)',
276 'target_arch%': '<(target_arch)', 283 'target_arch%': '<(target_arch)',
277 'target_subarch%': '<(target_subarch)', 284 'target_subarch%': '<(target_subarch)',
278 'mips_arch_variant%': '<(mips_arch_variant)', 285 'mips_arch_variant%': '<(mips_arch_variant)',
286 'mips_dsp_rev%': '<(mips_dsp_rev)',
279 'toolkit_views%': '<(toolkit_views)', 287 'toolkit_views%': '<(toolkit_views)',
280 'desktop_linux%': '<(desktop_linux)', 288 'desktop_linux%': '<(desktop_linux)',
281 'use_aura%': '<(use_aura)', 289 'use_aura%': '<(use_aura)',
282 'use_ash%': '<(use_ash)', 290 'use_ash%': '<(use_ash)',
283 'use_cras%': '<(use_cras)', 291 'use_cras%': '<(use_cras)',
284 'use_libpci%': '<(use_libpci)', 292 'use_libpci%': '<(use_libpci)',
285 'use_ozone%': '<(use_ozone)', 293 'use_ozone%': '<(use_ozone)',
286 'use_ozone_evdev%': '<(use_ozone_evdev)', 294 'use_ozone_evdev%': '<(use_ozone_evdev)',
287 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 295 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
288 'embedded%': '<(embedded)', 296 'embedded%': '<(embedded)',
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 # Set to 1 to support old history files 1063 # Set to 1 to support old history files
1056 'support_pre_M6_history_database%': '1', 1064 'support_pre_M6_history_database%': '1',
1057 }, 1065 },
1058 1066
1059 # Copy conditionally-set variables out one scope. 1067 # Copy conditionally-set variables out one scope.
1060 'branding%': '<(branding)', 1068 'branding%': '<(branding)',
1061 'buildtype%': '<(buildtype)', 1069 'buildtype%': '<(buildtype)',
1062 'target_arch%': '<(target_arch)', 1070 'target_arch%': '<(target_arch)',
1063 'target_subarch%': '<(target_subarch)', 1071 'target_subarch%': '<(target_subarch)',
1064 'mips_arch_variant%': '<(mips_arch_variant)', 1072 'mips_arch_variant%': '<(mips_arch_variant)',
1073 'mips_dsp_rev%': '<(mips_dsp_rev)',
1065 'host_arch%': '<(host_arch)', 1074 'host_arch%': '<(host_arch)',
1066 'toolkit_views%': '<(toolkit_views)', 1075 'toolkit_views%': '<(toolkit_views)',
1067 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 1076 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
1068 'use_aura%': '<(use_aura)', 1077 'use_aura%': '<(use_aura)',
1069 'use_ash%': '<(use_ash)', 1078 'use_ash%': '<(use_ash)',
1070 'use_cras%': '<(use_cras)', 1079 'use_cras%': '<(use_cras)',
1071 'use_libpci%': '<(use_libpci)', 1080 'use_libpci%': '<(use_libpci)',
1072 'use_openssl%': '<(use_openssl)', 1081 'use_openssl%': '<(use_openssl)',
1073 'use_openssl_certs%': '<(use_openssl_certs)', 1082 'use_openssl_certs%': '<(use_openssl_certs)',
1074 'use_nss%': '<(use_nss)', 1083 'use_nss%': '<(use_nss)',
(...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 ], 2283 ],
2275 # Change the default to hard once the armhf transition is complete. 2284 # Change the default to hard once the armhf transition is complete.
2276 'arm_float_abi%': 'softfp', 2285 'arm_float_abi%': 'softfp',
2277 'arm_thumb%': 1, 2286 'arm_thumb%': 1,
2278 }], 2287 }],
2279 2288
2280 # Set default compiler flags depending on MIPS architecture variant. 2289 # Set default compiler flags depending on MIPS architecture variant.
2281 ['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_bu ild==0', { 2290 ['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_bu ild==0', {
2282 'mips_fpu_mode%': 'fp32', 2291 'mips_fpu_mode%': 'fp32',
2283 }], 2292 }],
2293 ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_bu ild==0', {
2294 'mips_float_abi%': 'hard',
wtc 2015/02/20 01:58:56 The conditional expression and the default value m
2295 }],
2284 2296
2285 ['android_webview_build==1', { 2297 ['android_webview_build==1', {
2286 # The WebView build gets its cpu-specific flags from the Android build s ystem. 2298 # The WebView build gets its cpu-specific flags from the Android build s ystem.
2287 'arm_arch%': '', 2299 'arm_arch%': '',
2288 'arm_tune%': '', 2300 'arm_tune%': '',
2289 'arm_fpu%': '', 2301 'arm_fpu%': '',
2290 'arm_float_abi%': '', 2302 'arm_float_abi%': '',
2291 'arm_thumb%': 0, 2303 'arm_thumb%': 0,
2292 'mips_fpu_mode%': '', 2304 'mips_fpu_mode%': '',
2305 'mips_float_abi%': '',
2293 }], 2306 }],
2294 2307
2295 # Enable brlapi by default for chromeos. 2308 # Enable brlapi by default for chromeos.
2296 [ 'chromeos==1', { 2309 [ 'chromeos==1', {
2297 'use_brlapi%': 1, 2310 'use_brlapi%': 1,
2298 }], 2311 }],
2299 2312
2300 ['use_ozone==1 and ozone_auto_platforms==1', { 2313 ['use_ozone==1 and ozone_auto_platforms==1', {
2301 # Use test as the default platform. 2314 # Use test as the default platform.
2302 'ozone_platform%': 'test', 2315 'ozone_platform%': 'test',
(...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after
4022 ], 4035 ],
4023 }], 4036 }],
4024 ], 4037 ],
4025 }], 4038 }],
4026 ], 4039 ],
4027 }], 4040 }],
4028 ['target_arch=="mipsel"', { 4041 ['target_arch=="mipsel"', {
4029 'target_conditions': [ 4042 'target_conditions': [
4030 ['_toolset=="target"', { 4043 ['_toolset=="target"', {
4031 'conditions': [ 4044 'conditions': [
4032 ['android_webview_build==0 and mips_arch_variant=="r6"', { 4045 ['android_webview_build==0 and mips_arch_variant=="r6"', {
kjellander_chromium 2015/02/23 13:22:35 I suggest having a single, outer, condition block
wtc 2015/02/23 20:15:51 Done. Good suggestion.
4033 'cflags': ['-mips32r6', '-Wa,-mips32r6'], 4046 'cflags': ['-mips32r6', '-Wa,-mips32r6'],
4034 'conditions': [ 4047 'conditions': [
4035 ['OS=="android"', { 4048 ['OS=="android"', {
4036 'ldflags': ['-mips32r6', '-Wl,-melf32ltsmip',], 4049 'ldflags': ['-mips32r6', '-Wl,-melf32ltsmip',],
4037 }], 4050 }],
4038 ], 4051 ],
4039 }], 4052 }],
4040 ['android_webview_build==0 and mips_arch_variant=="r2"', { 4053 ['android_webview_build==0 and mips_arch_variant=="r2"', {
4054 'conditions': [
4055 ['mips_fpu_mode=="fp32"', {
4056 'cflags': ['-mfp32'],
kjellander_chromium 2015/02/23 13:22:35 at https://code.google.com/p/webrtc/source/browse/
brettw 2015/02/23 18:51:36 cflags in GN and GYP apply to both C and C++ files
wtc 2015/02/23 20:15:51 Brett, thank you for answering Henrik's question.
4057 }],
4058 ['mips_fpu_mode=="fp64"', {
4059 'cflags': ['-mfp64'],
4060 }],
4061 ['mips_fpu_mode=="fpxx"', {
4062 'cflags': ['-mfpxx'],
4063 }],
4064 ],
wtc 2015/02/20 01:58:56 This block of code matches the code for 'mips_fpu_
4041 'cflags': ['-mips32r2', '-Wa,-mips32r2'], 4065 'cflags': ['-mips32r2', '-Wa,-mips32r2'],
4042 }], 4066 }],
4043 ['android_webview_build==0 and mips_arch_variant=="r1"', { 4067 ['android_webview_build==0 and mips_arch_variant=="r1"', {
4044 'cflags': ['-mips32', '-Wa,-mips32'], 4068 'cflags': ['-mips32', '-Wa,-mips32'],
4045 }], 4069 }],
4070 ['android_webview_build==0 and mips_dsp_rev==1', {
4071 'cflags': ['-mdsp'],
kjellander_chromium 2015/02/23 13:22:35 https://code.google.com/p/webrtc/source/browse/tru
4072 }],
4073 ['android_webview_build==0 and mips_dsp_rev==2', {
4074 'cflags': ['-mdspr2'],
kjellander_chromium 2015/02/23 13:22:35 https://code.google.com/p/webrtc/source/browse/tru
4075 }],
wtc 2015/02/20 01:58:56 This block of code matches the code for mips_dsp_r
4076 ['android_webview_build==0 and mips_arch_variant!="r6"', {
4077 'cflags': ['-m<(mips_float_abi)-float'],
4078 }],
wtc 2015/02/20 01:58:56 This block of code matches the code for mips_fpu i
4046 ], 4079 ],
4047 'ldflags': [ 4080 'ldflags': [
4048 '-Wl,--no-keep-memory' 4081 '-Wl,--no-keep-memory'
4049 ], 4082 ],
4050 'cflags_cc': [ 4083 'cflags_cc': [
4051 '-Wno-uninitialized', 4084 '-Wno-uninitialized',
4052 ], 4085 ],
4053 }], 4086 }],
4054 ], 4087 ],
4055 }], 4088 }],
(...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after
5918 # settings in target dicts. SYMROOT is a special case, because many other 5951 # settings in target dicts. SYMROOT is a special case, because many other
5919 # Xcode variables depend on it, including variables such as 5952 # Xcode variables depend on it, including variables such as
5920 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5953 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5921 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5954 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5922 # files to appear (when present) in the UI as actual files and not red 5955 # files to appear (when present) in the UI as actual files and not red
5923 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5956 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5924 # and therefore SYMROOT, needs to be set at the project level. 5957 # and therefore SYMROOT, needs to be set at the project level.
5925 'SYMROOT': '<(DEPTH)/xcodebuild', 5958 'SYMROOT': '<(DEPTH)/xcodebuild',
5926 }, 5959 },
5927 } 5960 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698