This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
MIPS patch: MULTILIB_DEFAULTS
- To: <gcc-patches at gcc dot gnu dot org>
- Subject: MIPS patch: MULTILIB_DEFAULTS
- From: Gavin Romig-Koch <gavin at cygnus dot com>
- Date: Mon, 25 Oct 1999 17:59:03 -0400 (EDT)
I've just committed the following which does some minor cleanups
to MIPS_ISA_DEFAULTS and MULTILIB_DEFAULTS.
-gavin...
* 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.
Index: config/mips/mips.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/mips/mips.h,v
retrieving revision 1.72
diff -c -p -r1.72 mips.h
*** config/mips/mips.h 1999/10/24 19:48:51 1.72
--- config/mips/mips.h 1999/10/25 21:20:13
*************** extern void sbss_section PARAMS ((void)
*** 464,469 ****
--- 464,473 ----
#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"
*************** extern void sbss_section PARAMS ((void)
*** 472,479 ****
#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
--- 476,497 ----
#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, MULTILIB_ISA_DEFAULT }
#endif
/* We must pass -EL to the linker by default for little endian embedded
Index: config/mips/mips.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/mips/mips.c,v
retrieving revision 1.75
diff -c -p -r1.75 mips.c
*** config/mips/mips.c 1999/10/15 20:51:10 1.75
--- config/mips/mips.c 1999/10/25 21:21:15
*************** override_options ()
*** 4297,4306 ****
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
--- 4297,4302 ----
Index: config/mips/elf64.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/mips/elf64.h,v
retrieving revision 1.14
diff -c -p -r1.14 elf64.h
*** config/mips/elf64.h 1999/09/21 18:52:37 1.14
--- config/mips/elf64.h 1999/10/25 21:21:16
*************** Boston, MA 02111-1307, USA. */
*** 37,45 ****
#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"
--- 37,42 ----