Don't use m32 cflag for x86_64.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
   ],
   'conditions' : [
@@ skipping 10 matching lines @@
          [ '_type == "executable"', {
            'cflags': [ '-fPIE' ],
            'ldflags': [ '-pie' ],
          }],
        ],
       }],
      ],
     }],
 
     # As of M35, Chrome requires SSE2 on x86 (and SSSE3 on Mac).
-    [ 'skia_arch_type == "x86"', {
+    [ '"x86" in skia_arch_type', {

[mtklein, 2015/02/11 18:15:05]

You can probably leave this as-is.  These are both the default for x86_64
builds.

[scroggo, 2015/02/11 20:12:09]

Done.

       'cflags': [
         '-msse2',
         '-mfpmath=sse',
       ],
     }],
 
     [ 'skia_os == "win"',
       {
         'defines': [
           'SK_BUILD_FOR_WIN32',
@@ skipping 178 matching lines @@
         ],
         'cflags_cc': [
           '-std=c++11',
           '-fno-rtti',
           '-Wnon-virtual-dtor',
           '-Wno-invalid-offsetof',  # GCC <4.6 is old-school strict about what is POD.
         ],
         'conditions': [
           [ 'skia_os != "chromeos"', {
             'conditions': [
-              [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
+              [ 'skia_arch_width == 64 and "x86" in skia_arch_type', {

[djsollen, 2015/02/11 18:11:23]

skia_arch_type == "x86_64" seems more concise.

[mtklein, 2015/02/11 18:15:05]

Can't this just be
  if skia_arch_type == "x86_64"
or am I missing the point?

[scroggo, 2015/02/11 20:12:09]

No, you're correct. I caught this in my follow-up. Adding here.

                 'cflags': [
                   '-m64',

[scroggo, 2015/02/11 18:01:52]

In a follow-up CL, I'll condition this on !skia_android_framework.

                 ],
                 'ldflags': [
                   '-m64',
                 ],
               }],
-              [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
+              [ 'skia_arch_width == 32 and "x86" in skia_arch_type', {

[mtklein, 2015/02/11 18:15:05]

And this 
   if skia_arch_type == "x86"
?

[scroggo, 2015/02/11 20:12:09]

Done.

                 'cflags': [
                   '-m32',
                 ],
                 'ldflags': [
                   '-m32',
                 ],
               }],
             ],
           }],
           [ 'skia_warnings_as_errors', {
@@ skipping 372 matching lines @@
             'cflags': ['-O2'],
           },
         },
         'libraries': [
           '-llog',
         ],
         'cflags': [
           '-fuse-ld=gold',
         ],
         'conditions': [
-          [ 'skia_arch_type == "x86"', {
+          [ '"x86" in skia_arch_type', {

[scroggo, 2015/02/11 18:01:52]

Same here

[djsollen, 2015/02/11 18:11:23]

Yes please!

[mtklein, 2015/02/11 18:15:05]

This one seems right to me.  That's something we need to turn on explicitly for
both x86 and x86_64.

             'cflags': [
               '-mssse3',
             ],
           }],
           [ 'skia_android_framework', {
             'cflags!': [
               '-fuse-ld=gold',
             ],
           }],
           [ 'skia_shared_lib', {
@@ skipping 20 matching lines @@
     [ 'skia_is_bot', {
       'defines': [ 'SK_CRASH_HANDLER' ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }