summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 18:19:11 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 18:19:11 +0000
commit7a6455af28e108f19b0748572662a05b1fa5f901 (patch)
tree9648c733b1690d2739d62d3f60a71831c586cdfb
parent3b1fbe006317029ef5ac15b9755550f69fb1835e (diff)
downloadchromium_src-7a6455af28e108f19b0748572662a05b1fa5f901.zip
chromium_src-7a6455af28e108f19b0748572662a05b1fa5f901.tar.gz
chromium_src-7a6455af28e108f19b0748572662a05b1fa5f901.tar.bz2
Added -Wa,-mimplicit-it=always to cflags in skia build when neon is enabled.
When neon instructions are enabled and thumb mode is enabled when compiling skia for ARM on linux, the assembler dies because the assembly contains conditional instructions that are not in an IT block. This works around that issue by passing this flag. BUG=86592 TEST=Build Chromium with arm_neon=1 and check the option is passed. Review URL: http://codereview.chromium.org/7204013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89692 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--skia/skia.gyp9
1 files changed, 8 insertions, 1 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp
index d109d60..02fe86e 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -916,7 +916,14 @@
'defines': [
'__ARM_HAVE_NEON',
],
- }],
+ 'cflags': [
+ # The neon assembly contains conditional instructions which
+ # aren't enclosed in an IT block. The assembler complains
+ # without this option.
+ # See #86592.
+ '-Wa,-mimplicit-it=always',
+ ],
+ }],
],
# The assembly uses the frame pointer register (r7 in Thumb/r11 in
# ARM), the compiler doesn't like that.