Title: [95184] trunk/Source/WebCore
- Revision
- 95184
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-15 05:25:37 -0700 (Thu, 15 Sep 2011)
Log Message
[Chromium] Make sure that the ARM NEON files build with -marm
https://bugs.webkit.org/show_bug.cgi?id=68088
Simply adding the -marm cflag for OS=Android compiles results in it
being overridden by an -mthumb cflag later in the project generating
process. Therefore we should explicitly exclude -mthumb.
Patch by Peter Beverloo <pe...@chromium.org> on 2011-09-15
Reviewed by Tony Gentilcore.
* WebCore.gyp/WebCore.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95183 => 95184)
--- trunk/Source/WebCore/ChangeLog 2011-09-15 12:11:22 UTC (rev 95183)
+++ trunk/Source/WebCore/ChangeLog 2011-09-15 12:25:37 UTC (rev 95184)
@@ -1,3 +1,16 @@
+2011-09-15 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Make sure that the ARM NEON files build with -marm
+ https://bugs.webkit.org/show_bug.cgi?id=68088
+
+ Simply adding the -marm cflag for OS=Android compiles results in it
+ being overridden by an -mthumb cflag later in the project generating
+ process. Therefore we should explicitly exclude -mthumb.
+
+ Reviewed by Tony Gentilcore.
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-09-15 Keishi Hattori <kei...@webkit.org>
[chromium] Build fix: Remove use of GraphicsContext::setIsAcceleratedContext
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (95183 => 95184)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-09-15 12:11:22 UTC (rev 95183)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-09-15 12:25:37 UTC (rev 95184)
@@ -1572,6 +1572,10 @@
['include', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'],
],
'conditions': [
+ ['OS=="android"', {
+ 'cflags!': ['-mthumb'],
+ 'cflags': ['-marm'],
+ }],
['OS=="linux" and target_arch=="arm"', {
'cflags': ['-marm'],
}],
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
