Separate neon flags from armv7, because some platforms have armv7a but no neon.
For ffmpeg, I copied the "arm" configs (which include neon) into "arm-neon" configs, and changed HAVE_NEON=1 to 0 in the existing ones. Also, I removed the explicit cflags in ffmpeg.gyp since they are already set in common.gypi
Review URL: http://codereview.chromium.org/660067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40163 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index d61c933..a2a40ba 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', ],
+ }]
+ ],
}],
],
}],
