+1999-10-25 Gavin Romig-Koch <gavin@cygnus.com>
+
+ * config/mips/mips.h (MIPS_ISA_DEFAULT): Insure it's defined.
+ (MULTILIB_ISA_DEFAULT): New.
+ (MULTILIB_DEFAULTS): Use it.
+ * config/mips/mips.c (): Remove the now unnecessary definition
+ of MIPS_ISA_DEFAULT.
+ * config/mips/elf64.h (MULTILIB_DEFAULTS): Remove the now
+ unnecessary definition.
+
Mon Oct 25 22:08:35 1999 Richard Earnshaw (rearnsha@arm.com)
* arm.md (pic_load_addr): Add constraints to operand 1.
#include "mips/mips.h"
-#undef MULTILIB_DEFAULTS
-#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "mips3" }
-
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dmips -DMIPSEB -DR4000 -D_mips -D_MIPSEB -D_R4000"
else if (optimize)
target_flags |= MASK_GPOPT;
-#ifndef MIPS_ISA_DEFAULT
-#define MIPS_ISA_DEFAULT 1
-#endif
-
/* If both single-float and soft-float are set, then clear the one that
was set by TARGET_DEFAULT, leaving the one that was set by the
user. We assume here that the specs prevent both being set by the
#endif
#endif
+#ifndef MIPS_ISA_DEFAULT
+#define MIPS_ISA_DEFAULT 1
+#endif
+
#ifndef MULTILIB_ENDIAN_DEFAULT
#if TARGET_ENDIAN_DEFAULT == 0
#define MULTILIB_ENDIAN_DEFAULT "EL"
#endif
#endif
+#ifndef MULTILIB_ISA_DEFAULT
+#if MIPS_ISA_DEFAULT == 1
+#define MULTILIB_ISA_DEFAULT "mips1"
+#elif MIPS_ISA_DEFAULT == 2
+#define MULTILIB_ISA_DEFAULT "mips2"
+#elif MIPS_ISA_DEFAULT == 3
+#define MULTILIB_ISA_DEFAULT "mips3"
+#elif MIPS_ISA_DEFAULT == 4
+#define MULTILIB_ISA_DEFAULT "mips4"
+#else
+#define MULTILIB_ISA_DEFAULT "mips1"
+#endif
+#endif
+
#ifndef MULTILIB_DEFAULTS
-#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "mips1" }
+#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, MULTILIB_ISA_DEFAULT }
#endif
/* We must pass -EL to the linker by default for little endian embedded