Fix bug reported by Ian Taylor, mips64-elf multilibs are wrong.

	* elf64.h (MULTILIB_DEFAULTS): Move definition after mips.h include.

From-SVN: r19543

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0059a29d283a062e99d66912133872183e5753f0..955346f73ae68984816cad1db61fc4e119f7e480 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  5 14:33:49 1998  Jim Wilson  <wilson@cygnus.com>
+
+       * elf64.h (MULTILIB_DEFAULTS): Move definition after mips.h include.
+
 Tue May  5 10:50:39 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
        * config/m68k/m68k.h: Declare functions from m68k.c used in

diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index 3673c9ed1873fa0e768bf3b0f034c31855d88422..edd00bbe921fe1d55edc22f8037713de2ae3f496 100644 (file)
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -25,14 +25,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_DEFAULT MASK_FLOAT64|MASK_64BIT
 #define MIPS_ISA_DEFAULT 3
 
-#ifndef MULTILIB_DEFAULTS
-#if TARGET_ENDIAN_DEFAULT == 0
-#define MULTILIB_DEFAULTS { "EL", "mips3" }
-#else
-#define MULTILIB_DEFAULTS { "EB", "mips3" }
-#endif
-#endif
-
 /* Until we figure out what MIPS ELF targets normally use, just do
    stabs in ELF.  */
 #ifndef PREFERRED_DEBUGGING_TYPE
@@ -45,6 +37,15 @@ Boston, MA 02111-1307, USA.  */
 
 #include "mips/mips.h"
 
+/* This must be done after mips.h, because mips.h defines
+   TARGET_ENDIAN_DEFAULT.  */
+#undef MULTILIB_DEFAULTS
+#if TARGET_ENDIAN_DEFAULT == 0
+#define MULTILIB_DEFAULTS { "EL", "mips3" }
+#else
+#define MULTILIB_DEFAULTS { "EB", "mips3" }
+#endif
+
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dmips -DMIPSEB -DR4000 -D_mips -D_MIPSEB -D_R4000"