diff options
| author | djsollen@google.com <djsollen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:05:35 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:05:35 +0000 |
| commit | 00e1d2773de880b96aff7e2d33b2b0914778901f (patch) | |
| tree | 75c61441ac5745f2ac4d64b6d6be4e38a90564be /skia | |
| parent | 81ff4efd65efde3176a738ecd60c99ecc48b62c5 (diff) | |
| download | chromium_src-00e1d2773de880b96aff7e2d33b2b0914778901f.zip chromium_src-00e1d2773de880b96aff7e2d33b2b0914778901f.tar.gz chromium_src-00e1d2773de880b96aff7e2d33b2b0914778901f.tar.bz2 | |
Update NEON compiler flags for Skia to use the SK_ prefix.
The old defines will be left in place until the next Skia DEPS
roll. After that roll Skia will be switched to using the SK_
prefixed defines and the old reserved (i.e. __ARM*) defines can be
removed.
BUG=skia:2785
Review URL: https://codereview.chromium.org/430253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 4 | ||||
| -rw-r--r-- | skia/skia_common.gypi | 2 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 22 |
3 files changed, 4 insertions, 24 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 162a053..6786292 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -182,10 +182,10 @@ config("skia_library_config") { if (cpu_arch == "arm") { if (arm_use_neon) { - defines += [ "__ARM_HAVE_NEON" ] + defines += [ "SK_ARM_HAS_NEON", "__ARM_HAVE_NEON" ] } if (arm_optionally_use_neon) { - defines += [ "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ] + defines += [ "SK_ARM_HAS_OPTIONAL_NEON", "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ] } } diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 46d0736..23da0a9 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -111,11 +111,13 @@ # Neon support. [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { 'defines': [ + 'SK_ARM_HAS_NEON', '__ARM_HAVE_NEON', ], }], [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { 'defines': [ + 'SK_ARM_HAS_OPTIONAL_NEON', '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', ], }], diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 37f5eb4..1536ee7 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -65,16 +65,6 @@ }], [ 'target_arch == "arm"', { 'conditions': [ - [ 'arm_version >= 7 and arm_neon == 1', { - 'defines': [ - '__ARM_HAVE_NEON', - ], - }], - [ 'arm_version >= 7 and arm_neon_optional == 1', { - 'defines': [ - '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', - ], - }], [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { 'cflags': [ # The neon assembly contains conditional instructions which @@ -332,18 +322,6 @@ '../third_party/skia/src/opts/memset16_neon.S', '../third_party/skia/src/opts/memset32_neon.S', ], - 'conditions': [ - ['arm_neon == 1', { - 'defines': [ - '__ARM_HAVE_NEON', - ], - }], - ['arm_neon_optional == 1', { - 'defines': [ - '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', - ], - }], - ], }, ], }], |