Don't use m32 cflag for x86_64.

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 22 matching lines @@
   #   we have variable definitions like this:  'skia_os%': '<(skia_os)',
   #
   # See http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi?revision=127004 ,
   # which deals with these same constraints in a similar manner.
   #
   'variables': {  # level 1
     'variables': {  # level 2
 
       # Variables needed by conditions list within the level-2 variables dict.
       'variables': {  # level 3
-        # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
-        # for cross-compilation (e.g. building for either MacOS or iOS on Mac).
-        # We set it automatically based on 'OS' (the host OS), but allow the
-        # user to override it via GYP_DEFINES if they like.
-        'skia_os%': '<(OS)',
+        'variables': { # level 4
+          # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
+          # for cross-compilation (e.g. building for either MacOS or iOS on Mac).
+          # We set it automatically based on 'OS' (the host OS), but allow the
+          # user to override it via GYP_DEFINES if they like.
+          'skia_os%': '<(OS)',
+        },
+        'skia_os%': '<(skia_os)',
 
         'skia_android_framework%': 0,
-        'skia_arch_type%': 'x86',
+        'conditions' : [
+          [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
+            'skia_arch_type%': 'x86_64',
+          }, {
+            'skia_arch_type%': 'x86',
+          }],
+        ],
         'arm_version%': 0,
         'arm_neon%': 0,
         'skia_egl%': 0,
       },
 
       # Re-define all variables defined within the level-3 'variables' dict,
       # so that siblings of the level-2 'variables' dict can see them.
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
       'skia_arch_type%': '<(skia_arch_type)',
@@ skipping 14 matching lines @@
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
         }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"] or skia_arch_type == "arm64"', {
+        ['"64" in skia_arch_type', {
           'skia_arch_width%': 64,
         }, {
           'skia_arch_width%': 32,
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
           'skia_egl%': 1,
         }, {
           'skia_static_initializers%': 1,
         }],
@@ skipping 142 matching lines @@
     'skia_moz2d%': 0,
     'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)")',
     'skia_egl%': '<(skia_egl)',
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }