gcc/

[pf3gnuchains/gcc-fork.git] / gcc / config / mips / vr.h

diff --git a/gcc/config/mips/vr.h b/gcc/config/mips/vr.h
index b4949f7..b5b32c8 100644 (file)
--- a/gcc/config/mips/vr.h
+++ b/gcc/config/mips/vr.h
@@ -20,13 +20,15 @@ along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
 #define DEFAULT_VR_ARCH "mfix-vr4130"
+#undef MIPS_ABI_DEFAULT
 #define MIPS_ABI_DEFAULT ABI_EABI
-#define MIPS_MARCH_CONTROLS_SOFT_FLOAT 1
+#undef MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
        { MULTILIB_ENDIAN_DEFAULT,              \
          MULTILIB_ABI_DEFAULT,                 \
          DEFAULT_VR_ARCH }
 
+#undef DRIVER_SELF_SPECS
 #define DRIVER_SELF_SPECS \
        /* Enforce the default architecture.  This is mostly for        \
           the assembler's benefit.  */                                 \
@@ -41,6 +43,9 @@ along with GCC; see the file COPYING3.  If not see
        /* Same idea for -mfix-vr4130.  */                              \
        "%{mfix-vr4130:%{!march=*:-march=vr4130}}",                     \
                                                                        \
+       /* Infer the default float setting from -march.  */             \
+       MIPS_ARCH_FLOAT_SPEC,                                           \
+                                                                       \
        /* Make -mabi=eabi -mlong32 the default.  */                    \
        "%{!mabi=*:-mabi=eabi %{!mlong*:-mlong32}}",                    \
                                                                        \
@@ -49,4 +54,7 @@ along with GCC; see the file COPYING3.  If not see
        "%{mabi=eabi:%{!mlong*:%{!mgp32:-mlong64}}}",                   \
                                                                        \
        /* Remove -mgp32 if it is redundant.  */                        \
-       "%{mabi=32:%<mgp32}"
+       "%{mabi=32:%<mgp32}",                                           \
+                                                                       \
+       /* Configuration-independent MIPS rules.  */                    \
+       BASE_DRIVER_SELF_SPECS