Changeset 95184 in webkit

Timestamp:

Sep 15, 2011 5:25:37 AM (13 years ago)

Author:

commit-queue@webkit.org

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 <​peter@chromium.org> on 2011-09-15
Reviewed by Tony Gentilcore.

• WebCore.gyp/WebCore.gyp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  Peter Beverloo  <peter@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  <keishi@webkit.org>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -1573 +1573 @@
       ],
       'conditions': [
+        ['OS=="android"', {
+          'cflags!': ['-mthumb'],
+          'cflags': ['-marm'],
+        }],
         ['OS=="linux" and target_arch=="arm"', {
           'cflags': ['-marm'],