diff options
| -rw-r--r-- | gcc/config/mips/elf64.h | 8 | ||||
| -rw-r--r-- | gcc/config/mips/mips.h | 10 | ||||
| -rw-r--r-- | gcc/config/mips/r3900.h | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h index 91c8310..986d219 100644 --- a/gcc/config/mips/elf64.h +++ b/gcc/config/mips/elf64.h @@ -37,14 +37,8 @@ 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 +#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "mips3" } #undef CPP_PREDEFINES #define CPP_PREDEFINES "-Dmips -DMIPSEB -DR4000 -D_mips -D_MIPSEB -D_R4000" diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 084f5d2..bd6f1ee 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -586,12 +586,16 @@ extern void mips_select_section (); #endif #endif -#ifndef MULTILIB_DEFAULTS +#ifndef MULTILIB_ENDIAN_DEFAULT #if TARGET_ENDIAN_DEFAULT == 0 -#define MULTILIB_DEFAULTS { "EL", "mips1" } +#define MULTILIB_ENDIAN_DEFAULT "EL" #else -#define MULTILIB_DEFAULTS { "EB", "mips1" } +#define MULTILIB_ENDIAN_DEFAULT "EB" +#endif #endif + +#ifndef MULTILIB_DEFAULTS +#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "mips1" } #endif /* We must pass -EL to the linker by default for little endian embedded diff --git a/gcc/config/mips/r3900.h b/gcc/config/mips/r3900.h index 3d7cac5..9b19f72 100644 --- a/gcc/config/mips/r3900.h +++ b/gcc/config/mips/r3900.h @@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA. */ #define MIPS_CPU_STRING_DEFAULT "R3900" #define MIPS_ISA_DEFAULT 1 -#define MULTILIB_DEFAULTS { "EB", "msoft-float" } +#define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "msoft-float" } /* We use the MIPS EABI by default. */ #define MIPS_ABI_DEFAULT ABI_EABI |