Changeset 117524 in webkit

Timestamp:

May 17, 2012 6:40:56 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Linux amd64 platform reported as i686
​https://bugs.webkit.org/show_bug.cgi?id=86778
​http://code.google.com/p/chromium/issues/detail?id=128167

Remove the old hard-coded gyp define and allow the more recent (but
still quite old) code in Source/WebCore/page/NavigatorBase.cpp to take
precedence and detect this at runtime.

Patch by Michael Moss <​mmoss@chromium.org> on 2012-05-17
Reviewed by Tony Chang.

No new tests because it's hardware dependent.

• 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 @@
+2012-05-17  Michael Moss  <mmoss@chromium.org>
+
+        Linux amd64 platform reported as i686
+        https://bugs.webkit.org/show_bug.cgi?id=86778
+        http://code.google.com/p/chromium/issues/detail?id=128167
+
+        Remove the old hard-coded gyp define and allow the more recent (but
+        still quite old) code in Source/WebCore/page/NavigatorBase.cpp to take
+        precedence and detect this at runtime.
+
+        Reviewed by Tony Chang.
+
+        No new tests because it's hardware dependent.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2012-05-17  Vangelis Kokkevis  <vangelis@chromium.org>
 

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

@@ -1303 +1303 @@
           ],
         }],
-        ['OS=="linux"', {
-          'direct_dependent_settings': {
-            'defines': [
-              # Mozilla on Linux effectively uses uname -sm, but when running
-              # 32-bit x86 code on an x86_64 processor, it uses
-              # "Linux i686 (x86_64)".  Matching that would require making a
-              # run-time determination.
-              'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"',
-            ],
-          },
-        }],
         ['OS=="mac"', {
           'dependencies': [