diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 18:22:52 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 18:22:52 +0000 |
| commit | f7bc14484d1272bb3cf0d62d65ae6f0a171eaed3 (patch) | |
| tree | 99840a27dec775ff7622af14be570bcc7920c938 /skia | |
| parent | ea267a2352d327cfdf1735584ffce801d3e44bb1 (diff) | |
| download | chromium_src-f7bc14484d1272bb3cf0d62d65ae6f0a171eaed3.zip chromium_src-f7bc14484d1272bb3cf0d62d65ae6f0a171eaed3.tar.gz chromium_src-f7bc14484d1272bb3cf0d62d65ae6f0a171eaed3.tar.bz2 | |
When NEON disabled, always build ARM memset routines.
Fixes:
...SkUtils_opts_arm.cpp:36:error: undefined reference to 'arm_memset16'
...SkUtils_opts_arm.cpp:53:error: undefined reference to 'arm_memset32'
BUG=155921,277433
TEST=Fixes missing memset routine during linking.
R=mtklein@google.com, reed@google.com
Review URL: https://codereview.chromium.org/391793002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 2 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index df86f1a..3c32f67 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -631,7 +631,7 @@ source_set("skia_opts") { } # Non-Neon ARM code. - if (arm_version < 7 || (!arm_use_neon && arm_optionally_use_neon)) { + if (arm_version < 7 || !arm_use_neon) { sources += [ "//third_party/skia/src/opts/memset.arm.S" ] } diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 948db08..e46273d 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -102,7 +102,7 @@ '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp', ], }], - [ 'target_arch == "arm" and (arm_version < 7 or (arm_neon == 0 and arm_neon_optional == 1))', { + [ 'target_arch == "arm" and (arm_version < 7 or arm_neon == 0)', { 'sources': [ '../third_party/skia/src/opts/memset.arm.S', ], |