diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-24 14:09:02 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-24 14:09:02 +0000 |
| commit | cf7403040e360f4346848fe7b910ee291c57d28f (patch) | |
| tree | 25b1d83009b43cb14ed5d32ecbdbc9efd784126f | |
| parent | 87f982c80833eeebf541becec8e27b96c8c889f7 (diff) | |
Enable hardware float for all armv7 and add NDK required linker flags
git-svn-id: http://skia.googlecode.com/svn/trunk@3247 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_conditions.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index faa48fb45d..f119f28f56 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -177,6 +177,12 @@ '-fno-rtti', ], 'conditions': [ + [ 'skia_target_arch == "arm", { + 'ldflags': [ + '-Wl', + '--fix-cortex-a8', + ], + }], [ 'skia_target_arch == "arm" and arm_thumb == 1', { 'cflags': [ '-mthumb', @@ -188,6 +194,7 @@ ], 'cflags': [ '-march=armv7-a', + '-mfloat-abi=softfp', ], 'conditions': [ [ 'arm_neon == 1', { @@ -195,7 +202,6 @@ '__ARM_HAVE_NEON', ], 'cflags': [ - '-mfloat-abi=softfp', '-mfpu=neon', ], }], |