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

Unified Diff: build/common.gypi

Issue 660067: Separate neon flags from armv7, because some platforms have armv7a but no neon. (Closed)
Patch Set: Fix configure flags Created 10 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 | skia/skia.gyp » ('j') | no next file with comments »
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 df9610431ea284980ffa5d095f093cb594fd95d3..692890fe6b486aa489f39e75040092576228b1ec 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -82,6 +82,12 @@
# Set to 1 compile with -fPIC cflag on linux. This is a must for shared
# libraries on linux x86-64 and arm.
'linux_fpic%': 0,
+
+ # Set ARM-v7 compilation flags
+ 'armv7%': 0,
+
+ # Set Neon compilation flags (only meaningful if armv7==1).
+ 'arm_neon%': 1,
},
# Define branding and buildtype on the basis of their settings within the
@@ -95,6 +101,8 @@
'inside_chromium_build%': '<(inside_chromium_build)',
'fastbuild%': '<(fastbuild)',
'linux_fpic%': '<(linux_fpic)',
+ 'armv7%': '<(armv7)',
+ 'arm_neon%': '<(arm_neon)',
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
@@ -199,9 +207,6 @@
# isn't supported
'disable_nacl%': 0,
- # Set ARM-v7 compilation flags
- 'armv7%': 0,
-
# Set Thumb compilation flags.
'arm_thumb%': 0,
@@ -904,9 +909,15 @@
'cflags': [
'-march=armv7-a',
'-mtune=cortex-a8',
- '-mfpu=neon',
'-mfloat-abi=softfp',
],
+ 'conditions': [
+ ['arm_neon==1', {
+ 'cflags': [ '-mfpu=neon', ],
+ }, {
+ 'cflags': [ '-mfpu=vfpv3', ],
+ }]
+ ],
}],
],
}],
« no previous file with comments | « no previous file | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698