Index: Source/platform/blink_platform.gyp |
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp |
index 9f09481cc6a2af1ccd6bbbf9365f321c809a1244..7993b32caaa24a312c5adee46f37ca78c2a0be7d 100644 |
--- a/Source/platform/blink_platform.gyp |
+++ b/Source/platform/blink_platform.gyp |
@@ -237,11 +237,6 @@ |
# FIXME: Figure out how to store these patterns in a variable. |
['exclude', '(cf|cg|harfbuzz|mac|opentype|win)/'], |
['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'], |
- |
- # *NEON.cpp files need special compile options. |
- # They are moved to the webcore_0_neon target. |
- ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'], |
- ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], |
], |
# Disable c4267 warnings until we fix size_t to int truncations. |
# Disable c4724 warnings which is generated in VS2012 due to improper |
@@ -439,8 +434,22 @@ |
], |
}], |
['target_arch=="arm"', { |
- 'dependencies': [ |
- 'blink_arm_neon', |
+ 'conditions': [ |
+ ['arm_neon == 1 or arm_neon_optional == 1', { |
+ 'cflags!': [ |
+ '-mfpu=vfp', |
+ '-mfpu=vfpv3-d16', |
+ ], |
+ 'cflags': [ |
+ '-marm', |
+ '-mfpu=neon', |
+ ], |
+ 'conditions': [ |
+ ['OS=="android"', { |
+ 'cflags!': ['-mthumb'], |
+ }], |
+ ], |
+ }], |
], |
}], |
], |
@@ -452,35 +461,5 @@ |
], |
}], |
], |
- }, |
- # The *NEON.cpp files fail to compile when -mthumb is passed. Force |
- # them to build in ARM mode. |
- # See https://bugs.webkit.org/show_bug.cgi?id=62916. |
- { |
- 'target_name': 'blink_arm_neon', |
- 'conditions': [ |
- ['target_arch=="arm"', { |
- 'type': 'static_library', |
- 'dependencies': [ |
- 'blink_common', |
- ], |
- 'hard_dependency': 1, |
- 'sources': [ |
- '<@(platform_files)', |
- ], |
- 'sources/': [ |
- ['exclude', '.*'], |
- ['include', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], |
- ], |
- 'cflags': ['-marm'], |
- 'conditions': [ |
- ['OS=="android"', { |
- 'cflags!': ['-mthumb'], |
- }], |
- ], |
- },{ # target_arch!="arm" |
- 'type': 'none', |
- }], |
- ], |
}], |
} |