diff options
| author | Gavin Romig-Koch <gavin@cygnus.com> | 1999-10-25 21:44:39 +0000 |
|---|---|---|
| committer | Gavin Romig-Koch <gavin@gcc.gnu.org> | 1999-10-25 21:44:39 +0000 |
| commit | ea09f0326216aca75ffdfb568b43393f46a823ae (patch) | |
| tree | 79299afac9d65f6a4920cc4eef0b5aee0f1bbc45 /gcc | |
| parent | f12c5ef37a7ed15c1aa5e0c61e6687c0c192e926 (diff) | |
| download | gcc-ea09f0326216aca75ffdfb568b43393f46a823ae.zip gcc-ea09f0326216aca75ffdfb568b43393f46a823ae.tar.gz gcc-ea09f0326216aca75ffdfb568b43393f46a823ae.tar.bz2 | |
mips.h (MIPS_ISA_DEFAULT): Insure it's defined.
* 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.
From-SVN: r30171
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/config/mips/elf64.h | 3 | ||||
| -rw-r--r-- | gcc/config/mips/mips.c | 4 | ||||
| -rw-r--r-- | gcc/config/mips/mips.h | 20 |
4 files changed, 29 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fcabdd8..6dd86f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +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. diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h index e55d88b..3ad4a08 100644 --- a/gcc/config/mips/elf64.h +++ b/gcc/config/mips/elf64.h @@ -37,9 +37,6 @@ Boston, MA 02111-1307, USA. */ #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" diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 69bd271..75e7421 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -4297,10 +4297,6 @@ override_options () 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 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 6e8ef76..cb00702 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -464,6 +464,10 @@ extern void sbss_section PARAMS ((void)); #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" @@ -472,8 +476,22 @@ extern void sbss_section PARAMS ((void)); #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 |