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 /skia | |
| 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 'skia')
| -rw-r--r-- | skia/skia.gyp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 78a71ac..d9fb72e 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -577,10 +577,14 @@ }], [ 'armv7 == 1', { 'defines': [ - '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], }], + [ 'armv7 == 1 and arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + }], [ 'target_arch == "arm"', { 'sources!': [ '../third_party/skia/src/opts/opts_check_SSE2.cpp' @@ -702,12 +706,16 @@ }, { # arm 'conditions': [ - ['armv7 == 1', { + [ 'armv7 == 1', { 'defines': [ - '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], - }] + }], + [ 'armv7 == 1 and arm_neon == 1', { + 'defines': [ + '__ARM_HAVE_NEON', + ], + }], ], # The assembly uses the frame pointer register (r7 in Thumb/r11 in # ARM), the compiler doesn't like that. |