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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1266286fb21062ccd14655de31415bc48665017f..190d80531457b44649b032918f28d77a8feb73c1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -184,6 +184,13 @@
# below for MIPS targets.
'mips_arch_variant%': '',
+ # MIPS DSP ASE revision. Possible values are:
+ # 0: unavailable
+ # 1: revision 1
+ # 2: revision 2
+ # Default: 0.
+ 'mips_dsp_rev%': 0,
+
'conditions': [
# Ash needs Aura.
['use_aura==0', {
@@ -276,6 +283,7 @@
'target_arch%': '<(target_arch)',
'target_subarch%': '<(target_subarch)',
'mips_arch_variant%': '<(mips_arch_variant)',
+ 'mips_dsp_rev%': '<(mips_dsp_rev)',
'toolkit_views%': '<(toolkit_views)',
'desktop_linux%': '<(desktop_linux)',
'use_aura%': '<(use_aura)',
@@ -1062,6 +1070,7 @@
'target_arch%': '<(target_arch)',
'target_subarch%': '<(target_subarch)',
'mips_arch_variant%': '<(mips_arch_variant)',
+ 'mips_dsp_rev%': '<(mips_dsp_rev)',
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
@@ -2281,6 +2290,9 @@
['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_build==0', {
'mips_fpu_mode%': 'fp32',
}],
+ ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
+ 'mips_float_abi%': 'hard',
wtc 2015/02/20 01:58:56 The conditional expression and the default value m
+ }],
['android_webview_build==1', {
# The WebView build gets its cpu-specific flags from the Android build system.
@@ -2290,6 +2302,7 @@
'arm_float_abi%': '',
'arm_thumb%': 0,
'mips_fpu_mode%': '',
+ 'mips_float_abi%': '',
}],
# Enable brlapi by default for chromeos.
@@ -4038,11 +4051,31 @@
],
}],
['android_webview_build==0 and mips_arch_variant=="r2"', {
+ 'conditions': [
+ ['mips_fpu_mode=="fp32"', {
+ '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.
+ }],
+ ['mips_fpu_mode=="fp64"', {
+ 'cflags': ['-mfp64'],
+ }],
+ ['mips_fpu_mode=="fpxx"', {
+ 'cflags': ['-mfpxx'],
+ }],
+ ],
wtc 2015/02/20 01:58:56 This block of code matches the code for 'mips_fpu_
'cflags': ['-mips32r2', '-Wa,-mips32r2'],
}],
['android_webview_build==0 and mips_arch_variant=="r1"', {
'cflags': ['-mips32', '-Wa,-mips32'],
}],
+ ['android_webview_build==0 and mips_dsp_rev==1', {
+ 'cflags': ['-mdsp'],
kjellander_chromium 2015/02/23 13:22:35 https://code.google.com/p/webrtc/source/browse/tru
+ }],
+ ['android_webview_build==0 and mips_dsp_rev==2', {
+ 'cflags': ['-mdspr2'],
kjellander_chromium 2015/02/23 13:22:35 https://code.google.com/p/webrtc/source/browse/tru
+ }],
wtc 2015/02/20 01:58:56 This block of code matches the code for mips_dsp_r
+ ['android_webview_build==0 and mips_arch_variant!="r6"', {
+ 'cflags': ['-m<(mips_float_abi)-float'],
+ }],
wtc 2015/02/20 01:58:56 This block of code matches the code for mips_fpu i
],
'ldflags': [
'-Wl,--no-keep-memory'
« 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