MIPS: Fix '[turbofan] Prevent storing signalling NaNs into holey double arrays.'

gypfiles/toolchain.gypi

Index: gypfiles/toolchain.gypi
diff --git a/gypfiles/toolchain.gypi b/gypfiles/toolchain.gypi
index 4778b110614496aee8935c131141dd37b447a160..ec1e126d34d5ad64fd3d27110b3067ede3b7284a 100644
--- a/gypfiles/toolchain.gypi
+++ b/gypfiles/toolchain.gypi
@@ -364,28 +364,49 @@
         ],
         'cflags': ['-march=i586'],
       }],  # v8_target_arch=="x87"
-      ['(v8_target_arch=="mips" or v8_target_arch=="mipsel" \
-        or v8_target_arch=="mips64" or v8_target_arch=="mips64el") \
-         and v8_target_arch==target_arch', {
+      ['v8_target_arch=="mips" or v8_target_arch=="mipsel" \
+        or v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
         'target_conditions': [
           ['_toolset=="target"', {
-            # Target built with a Mips CXX compiler.
-            'variables': {
-              'ldso_path%': '<!(/bin/echo -n $LDSO_PATH)',
-              'ld_r_path%': '<!(/bin/echo -n $LD_R_PATH)',
-            },
             'conditions': [
-              ['ldso_path!=""', {
-                'ldflags': ['-Wl,--dynamic-linker=<(ldso_path)'],
-              }],
-              ['ld_r_path!=""', {
-                'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
+              ['v8_target_arch==target_arch', {
+                # Target built with a Mips CXX compiler.
+                'conditions': [

[Michael Achenbach, 2016/07/26 06:32:29]

These leftover conditions led to the drmemory errors on chromium.

[balazs.kilvady, 2016/07/26 15:58:23]

Thanks for catching it, I am going to upload a new CL with the fix.

+                ],
+                'variables': {
+                  'ldso_path%': '<!(/bin/echo -n $LDSO_PATH)',
+                  'ld_r_path%': '<!(/bin/echo -n $LD_R_PATH)',
+                },
+                'conditions': [
+                  ['ldso_path!=""', {
+                    'ldflags': ['-Wl,--dynamic-linker=<(ldso_path)'],
+                  }],
+                  ['ld_r_path!=""', {
+                    'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
+                  }],
+                  [ 'clang==1', {
+                    'cflags': ['-integrated-as'],
+                  }],
+                  ['OS!="mac"', {
+                    'defines': ['_MIPS_TARGET_HW',],
+                  }, {
+                    'defines': ['_MIPS_TARGET_SIMULATOR',],
+                  }],
+                ],
+              }, {
+                'defines': ['_MIPS_TARGET_SIMULATOR',],
               }],
-              [ 'clang==1', {
-                'cflags': ['-integrated-as'],
+            ],
+          }],  #'_toolset=="target"
+          ['_toolset=="host"', {
+            'conditions': [
+              ['v8_target_arch==target_arch and OS!="mac"', {
+                'defines': ['_MIPS_TARGET_HW',],
+              }, {
+                'defines': ['_MIPS_TARGET_SIMULATOR',],
               }],
             ],
-          }],
+          }],  #'_toolset=="host"
         ],
       }],
       ['v8_target_arch=="mips"', {