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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 17aae8e..d3fbb92 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+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>
 
         [chromium] Expose layer tiling size options to WebSettings.

diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp
index 44fe767..9425df1 100644 (file)
--- a/Source/WebCore/WebCore.gyp/WebCore.gyp
+++ b/Source/WebCore/WebCore.gyp/WebCore.gyp
@@ -1302,17 +1302,6 @@
             '<(chromium_src_dir)/build/linux/system.gyp:gtk',
           ],
         }],
-        ['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': [
             'webkit_system_interface',