diff options
| author | joel@chromium.org <joel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 06:59:21 +0000 |
|---|---|---|
| committer | joel@chromium.org <joel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-17 06:59:21 +0000 |
| commit | f129ad960413cc69e4bd24acfde6b6510a8e28b9 (patch) | |
| tree | 961adac0c7c5e8463459c064f8a431b25db2f1b4 /skia | |
| parent | 8d046d82dafe815466f33666cd3e2ed07c07de98 (diff) | |
| download | chromium_src-f129ad960413cc69e4bd24acfde6b6510a8e28b9.zip chromium_src-f129ad960413cc69e4bd24acfde6b6510a8e28b9.tar.gz chromium_src-f129ad960413cc69e4bd24acfde6b6510a8e28b9.tar.bz2 | |
Fix thumb build
This fixes the following error seen when attempting to build with -mthumb on gcc-4.4:
CXX(target) out/Release/obj.target/skia/third_party/skia/src/opts/SkBlitRow_opts_arm.o
/tmp/ccINCRGl.s: Assembler messages:
/tmp/ccINCRGl.s:105: Error: thumb conditional instruction should be in IT block -- `moveq ip,#8'
make: *** [out/Release/obj.target/skia/third_party/skia/src/opts/SkBlitRow_opts_arm.o] Error 1
Review URL: http://codereview.chromium.org/399023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 714f959..4caa5dc 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -581,6 +581,11 @@ '__ARM_HAVE_NEON', '__ARM_ARCH__=7', ], + 'cflags!': [ + # These files contain ARM assembly, and building with thumb breaks + # the assembler. + '-mthumb', + ], 'sources!': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', |