From 3d90c2b510d9cf3b41a32f05e6e2b7f1562cf3ad Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 5 May 1998 14:35:14 +0000 Subject: [PATCH] Fix bug reported by Ian Taylor, mips64-elf multilibs are wrong. * elf64.h (MULTILIB_DEFAULTS): Move definition after mips.h include. From-SVN: r19543 --- gcc/ChangeLog | 4 ++++ gcc/config/mips/elf64.h | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0059a29d283..955346f73ae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Tue May 5 14:33:49 1998 Jim Wilson + + * elf64.h (MULTILIB_DEFAULTS): Move definition after mips.h include. + Tue May 5 10:50:39 1998 Andreas Schwab * 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 3673c9ed187..edd00bbe921 100644 --- 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" -- 2.30.2