| Index: gyp/common_conditions.gypi
|
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
|
| index 7f0b6021ddcc1265609a380c89d19c7255984451..5f99eae34077f2fc3b90c751eaa3f997b8aa1fcb 100644
|
| --- a/gyp/common_conditions.gypi
|
| +++ b/gyp/common_conditions.gypi
|
| @@ -265,28 +265,10 @@
|
| '-fno-omit-frame-pointer',
|
| ],
|
| }],
|
| - [ 'skia_arch_type == "arm" and arm_thumb == 1', {
|
| - 'cflags': [
|
| - '-mthumb',
|
| - ],
|
| - # The --fix-cortex-a8 switch enables a link-time workaround for
|
| - # an erratum in certain Cortex-A8 processors. The workaround is
|
| - # enabled by default if you target the ARM v7-A arch profile.
|
| - # It can be enabled otherwise by specifying --fix-cortex-a8, or
|
| - # disabled unconditionally by specifying --no-fix-cortex-a8.
|
| - #
|
| - # The erratum only affects Thumb-2 code.
|
| - 'conditions': [
|
| - [ 'arm_version < 7', {
|
| - 'ldflags': [
|
| - '-Wl,--fix-cortex-a8',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| [ 'skia_arch_type == "arm" and arm_version >= 7', {
|
| 'cflags': [
|
| '-march=armv7-a',
|
| + '-mthumb',
|
| ],
|
| 'ldflags': [
|
| '-march=armv7-a',
|
|
|