MIPS compiler flags: use -mfp32 or -mfp64 only if -mhard-float is used.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 2bf4dddfa3222f35e801bba5b51eb96974b7d4ac..7aaec05f91c156c76d95413e4f813fac70504db5 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2302,13 +2302,13 @@
         'arm_thumb%': 1,
       }],
 
-      # Set default compiler flags depending on MIPS architecture variant.
-      ['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_build==0', {
-        'mips_fpu_mode%': 'fp32',
-      }],
+      # Set default compiler flags for MIPS floating-point support.
       ['target_arch=="mipsel" and android_webview_build==0', {
         'mips_float_abi%': 'hard',
       }],
+      ['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_build==0', {
+        'mips_fpu_mode%': 'fp32',

[wtc, 2015/03/03 23:21:41]

I reordered these two build variables to suggest that mips_fpu_mode is
subordinate to mips_float_abi.

+      }],
 
       ['android_webview_build==1', {
         # The WebView build gets its cpu-specific flags from the Android build system.
@@ -2317,8 +2317,8 @@
         'arm_fpu%': '',
         'arm_float_abi%': '',
         'arm_thumb%': 0,
-        'mips_fpu_mode%': '',
         'mips_float_abi%': '',
+        'mips_fpu_mode%': '',
       }],
 
       # Enable brlapi by default for chromeos.
@@ -4081,7 +4081,7 @@
                       ['mips_arch_variant=="r2"', {
                         'cflags': ['-mips32r2', '-Wa,-mips32r2'],
                         'conditions': [
-                          ['mips_fpu_mode!=""', {
+                          ['mips_float_abi=="hard" and mips_fpu_mode!=""', {
                             'cflags': ['-m<(mips_fpu_mode)'],
                           }],
                         ],