Don't use m32 cflag for x86_64.

gyp/common_conditions.gypi

Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 15db2a61e89aba36c4d725677144e15cb0f3cfff..268f2307c0ad941223b704f2f62df0f99e0736a9 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -28,7 +28,7 @@
     }],
 
     # 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',
@@ -227,7 +227,7 @@
         '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.

                 ],
@@ -235,7 +235,7 @@
                   '-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',
                 ],
@@ -628,7 +628,7 @@
           '-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',
             ],