diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 21:53:43 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 21:53:43 +0000 |
| commit | eafc0b45422fd004cbe5ca652eb5dd36a86b1c31 (patch) | |
| tree | 59e5fd67d9d7f207169301c47a4ee936ac0a2138 /build | |
| parent | 59c2df4864cf1ab387fd9aef4b87ec1a43be922d (diff) | |
| download | chromium_src-eafc0b45422fd004cbe5ca652eb5dd36a86b1c31.zip chromium_src-eafc0b45422fd004cbe5ca652eb5dd36a86b1c31.tar.gz chromium_src-eafc0b45422fd004cbe5ca652eb5dd36a86b1c31.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 19 |
1 files changed, 15 insertions, 4 deletions
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', ], + }] + ], }], ], }], |