OSDN Git Service

Fix MIPS SPEC95 FP 146.wave5 -fprofile-generate failure.
[pf3gnuchains/gcc-fork.git] / gcc / config / mips / mips.h
index 2e5fb7a..c3c5827 100644 (file)
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.  MIPS version.
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
-   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by A. Lichnewsky (lich@inria.inria.fr).
    Changed by Michael Meissner (meissner@osf.org).
    64 bit r4000 support by Ian Lance Taylor (ian@cygnus.com) and
@@ -57,6 +57,7 @@ enum processor_type {
   PROCESSOR_R4100,
   PROCESSOR_R4111,
   PROCESSOR_R4120,
+  PROCESSOR_R4130,
   PROCESSOR_R4300,
   PROCESSOR_R4600,
   PROCESSOR_R4650,
@@ -97,7 +98,6 @@ struct mips_cpu_info {
   int isa;
 };
 
-extern char mips_reg_names[][8];       /* register names (a0 vs. $4).  */
 extern char mips_print_operand_punct[256]; /* print_operand punctuation chars */
 extern const char *current_function_file; /* filename current function is in */
 extern int num_source_filenames;       /* current .file # */
@@ -116,13 +116,11 @@ extern enum processor_type mips_tune;   /* which cpu to schedule for */
 extern int mips_isa;                   /* architectural level */
 extern int mips_abi;                   /* which ABI to use */
 extern int mips16_hard_float;          /* mips16 without -msoft-float */
-extern int mips_entry;                 /* generate entry/exit for mips16 */
 extern const char *mips_arch_string;    /* for -march=<xxx> */
 extern const char *mips_tune_string;    /* for -mtune=<xxx> */
 extern const char *mips_isa_string;    /* for -mips{1,2,3,4} */
 extern const char *mips_abi_string;    /* for -mabi={32,n32,64} */
 extern const char *mips_cache_flush_func;/* for -mflush-func= and -mno-flush-func */
-extern int mips_string_length;         /* length of strings for mips16 */
 extern const struct mips_cpu_info mips_cpu_info_table[];
 extern const struct mips_cpu_info *mips_arch_info;
 extern const struct mips_cpu_info *mips_tune_info;
@@ -146,123 +144,116 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define MASK_NO_FUSED_MADD 0x00000008   /* Don't generate floating point
                                           multiply-add operations.  */
 #define MASK_GAS          0x00000010   /* Gas used instead of MIPS as */
-#define MASK_NAME_REGS    0x00000020   /* Use MIPS s/w reg name convention */
-#define MASK_EXPLICIT_RELOCS 0x00000040 /* Use relocation operators.  */
-#define MASK_MEMCPY       0x00000080   /* call memcpy instead of inline code*/
-#define MASK_SOFT_FLOAT           0x00000100   /* software floating point */
-#define MASK_FLOAT64      0x00000200   /* fp registers are 64 bits */
-#define MASK_ABICALLS     0x00000400   /* emit .abicalls/.cprestore/.cpload */
-#define MASK_XGOT         0x00000800   /* emit big-got PIC */
-#define MASK_LONG_CALLS           0x00001000   /* Always call through a register */
-#define MASK_64BIT        0x00002000   /* Use 64 bit GP registers and insns */
-#define MASK_EMBEDDED_PIC  0x00004000  /* Generate embedded PIC code */
-#define MASK_EMBEDDED_DATA 0x00008000  /* Reduce RAM usage, not fast code */
-#define MASK_BIG_ENDIAN           0x00010000   /* Generate big endian code */
-#define MASK_SINGLE_FLOAT  0x00020000  /* Only single precision FPU.  */
-#define MASK_MAD          0x00040000   /* Generate mad/madu as on 4650.  */
-#define MASK_4300_MUL_FIX  0x00080000   /* Work-around early Vr4300 CPU bug */
-#define MASK_MIPS16       0x00100000   /* Generate mips16 code */
+#define MASK_EXPLICIT_RELOCS 0x00000020 /* Use relocation operators.  */
+#define MASK_MEMCPY       0x00000040   /* call memcpy instead of inline code*/
+#define MASK_SOFT_FLOAT           0x00000080   /* software floating point */
+#define MASK_FLOAT64      0x00000100   /* fp registers are 64 bits */
+#define MASK_ABICALLS     0x00000200   /* emit .abicalls/.cprestore/.cpload */
+#define MASK_XGOT         0x00000400   /* emit big-got PIC */
+#define MASK_LONG_CALLS           0x00000800   /* Always call through a register */
+#define MASK_64BIT        0x00001000   /* Use 64 bit GP registers and insns */
+#define MASK_EMBEDDED_DATA 0x00002000  /* Reduce RAM usage, not fast code */
+#define MASK_BIG_ENDIAN           0x00004000   /* Generate big endian code */
+#define MASK_SINGLE_FLOAT  0x00008000  /* Only single precision FPU.  */
+#define MASK_MAD          0x00010000   /* Generate mad/madu as on 4650.  */
+#define MASK_4300_MUL_FIX  0x00020000   /* Work-around early Vr4300 CPU bug */
+#define MASK_MIPS16       0x00040000   /* Generate mips16 code */
 #define MASK_NO_CHECK_ZERO_DIV \
-                          0x00200000   /* divide by zero checking */
-#define MASK_BRANCHLIKELY  0x00400000   /* Generate Branch Likely
+                          0x00080000   /* divide by zero checking */
+#define MASK_BRANCHLIKELY  0x00100000   /* Generate Branch Likely
                                           instructions.  */
 #define MASK_UNINIT_CONST_IN_RODATA \
-                          0x00800000   /* Store uninitialized
+                          0x00200000   /* Store uninitialized
                                           consts in rodata */
-#define MASK_FIX_SB1       0x01000000   /* Work around SB-1 errata. */
+#define MASK_FIX_R4000    0x00400000   /* Work around R4000 errata.  */
+#define MASK_FIX_R4400    0x00800000   /* Work around R4400 errata.  */
+#define MASK_FIX_SB1      0x01000000   /* Work around SB-1 errata.  */
+#define MASK_FIX_VR4120           0x02000000   /* Work around VR4120 errata.  */
+#define MASK_VR4130_ALIGN  0x04000000  /* Perform VR4130 alignment opts.  */
+#define MASK_FP_EXCEPTIONS 0x08000000   /* FP exceptions are enabled.  */
 
                                        /* Debug switches, not documented */
 #define MASK_DEBUG     0               /* unused */
-#define MASK_DEBUG_A   0               /* don't allow <label>($reg) addrs */
-#define MASK_DEBUG_B   0               /* GO_IF_LEGITIMATE_ADDRESS debug */
-#define MASK_DEBUG_C   0               /* don't expand seq, etc.  */
 #define MASK_DEBUG_D   0               /* don't do define_split's */
-#define MASK_DEBUG_E   0               /* function_arg debug */
-#define MASK_DEBUG_F   0               /* ??? */
-#define MASK_DEBUG_G   0               /* don't support 64 bit arithmetic */
-#define MASK_DEBUG_I   0               /* unused */
 
                                        /* Dummy switches used only in specs */
 #define MASK_MIPS_TFILE        0               /* flag for mips-tfile usage */
 
                                        /* r4000 64 bit sizes */
-#define TARGET_INT64           (target_flags & MASK_INT64)
-#define TARGET_LONG64          (target_flags & MASK_LONG64)
-#define TARGET_FLOAT64         (target_flags & MASK_FLOAT64)
-#define TARGET_64BIT           (target_flags & MASK_64BIT)
+#define TARGET_INT64           ((target_flags & MASK_INT64) != 0)
+#define TARGET_LONG64          ((target_flags & MASK_LONG64) != 0)
+#define TARGET_FLOAT64         ((target_flags & MASK_FLOAT64) != 0)
+#define TARGET_64BIT           ((target_flags & MASK_64BIT) != 0)
 
                                        /* Mips vs. GNU linker */
-#define TARGET_SPLIT_ADDRESSES (target_flags & MASK_SPLIT_ADDR)
+#define TARGET_SPLIT_ADDRESSES ((target_flags & MASK_SPLIT_ADDR) != 0)
 
                                        /* Mips vs. GNU assembler */
-#define TARGET_GAS             (target_flags & MASK_GAS)
+#define TARGET_GAS             ((target_flags & MASK_GAS) != 0)
 #define TARGET_MIPS_AS         (!TARGET_GAS)
 
                                        /* Debug Modes */
-#define TARGET_DEBUG_MODE      (target_flags & MASK_DEBUG)
-#define TARGET_DEBUG_A_MODE    (target_flags & MASK_DEBUG_A)
-#define TARGET_DEBUG_B_MODE    (target_flags & MASK_DEBUG_B)
-#define TARGET_DEBUG_C_MODE    (target_flags & MASK_DEBUG_C)
-#define TARGET_DEBUG_D_MODE    (target_flags & MASK_DEBUG_D)
-#define TARGET_DEBUG_E_MODE    (target_flags & MASK_DEBUG_E)
-#define TARGET_DEBUG_F_MODE    (target_flags & MASK_DEBUG_F)
-#define TARGET_DEBUG_G_MODE    (target_flags & MASK_DEBUG_G)
-#define TARGET_DEBUG_I_MODE    (target_flags & MASK_DEBUG_I)
-
-                                       /* Reg. Naming in .s ($21 vs. $a0) */
-#define TARGET_NAME_REGS       (target_flags & MASK_NAME_REGS)
+#define TARGET_DEBUG_MODE      ((target_flags & MASK_DEBUG) != 0)
+#define TARGET_DEBUG_D_MODE    ((target_flags & MASK_DEBUG_D) != 0)
 
                                        /* call memcpy instead of inline code */
-#define TARGET_MEMCPY          (target_flags & MASK_MEMCPY)
+#define TARGET_MEMCPY          ((target_flags & MASK_MEMCPY) != 0)
 
                                        /* .abicalls, etc from Pyramid V.4 */
-#define TARGET_ABICALLS                (target_flags & MASK_ABICALLS)
-#define TARGET_XGOT            (target_flags & MASK_XGOT)
+#define TARGET_ABICALLS                ((target_flags & MASK_ABICALLS) != 0)
+#define TARGET_XGOT            ((target_flags & MASK_XGOT) != 0)
 
                                        /* software floating point */
-#define TARGET_SOFT_FLOAT      (target_flags & MASK_SOFT_FLOAT)
+#define TARGET_SOFT_FLOAT      ((target_flags & MASK_SOFT_FLOAT) != 0)
 #define TARGET_HARD_FLOAT      (! TARGET_SOFT_FLOAT)
 
                                        /* always call through a register */
-#define TARGET_LONG_CALLS      (target_flags & MASK_LONG_CALLS)
-
-                                       /* generate embedded PIC code;
-                                          requires gas.  */
-#define TARGET_EMBEDDED_PIC    (target_flags & MASK_EMBEDDED_PIC)
+#define TARGET_LONG_CALLS      ((target_flags & MASK_LONG_CALLS) != 0)
 
                                        /* for embedded systems, optimize for
                                           reduced RAM space instead of for
                                           fastest code.  */
-#define TARGET_EMBEDDED_DATA   (target_flags & MASK_EMBEDDED_DATA)
+#define TARGET_EMBEDDED_DATA   ((target_flags & MASK_EMBEDDED_DATA) != 0)
 
                                        /* always store uninitialized const
                                           variables in rodata, requires
                                           TARGET_EMBEDDED_DATA.  */
-#define TARGET_UNINIT_CONST_IN_RODATA  (target_flags & MASK_UNINIT_CONST_IN_RODATA)
+#define TARGET_UNINIT_CONST_IN_RODATA  \
+                       ((target_flags & MASK_UNINIT_CONST_IN_RODATA) != 0)
 
                                        /* generate big endian code.  */
-#define TARGET_BIG_ENDIAN      (target_flags & MASK_BIG_ENDIAN)
+#define TARGET_BIG_ENDIAN      ((target_flags & MASK_BIG_ENDIAN) != 0)
 
-#define TARGET_SINGLE_FLOAT    (target_flags & MASK_SINGLE_FLOAT)
+#define TARGET_SINGLE_FLOAT    ((target_flags & MASK_SINGLE_FLOAT) != 0)
 #define TARGET_DOUBLE_FLOAT    (! TARGET_SINGLE_FLOAT)
 
-#define TARGET_MAD             (target_flags & MASK_MAD)
+#define TARGET_MAD             ((target_flags & MASK_MAD) != 0)
+
+#define TARGET_FUSED_MADD      ((target_flags & MASK_NO_FUSED_MADD) == 0)
+
+#define TARGET_4300_MUL_FIX     ((target_flags & MASK_4300_MUL_FIX) != 0)
 
-#define TARGET_FUSED_MADD      (! (target_flags & MASK_NO_FUSED_MADD))
+#define TARGET_CHECK_ZERO_DIV   ((target_flags & MASK_NO_CHECK_ZERO_DIV) == 0)
 
-#define TARGET_4300_MUL_FIX     (target_flags & MASK_4300_MUL_FIX)
+#define TARGET_BRANCHLIKELY    ((target_flags & MASK_BRANCHLIKELY) != 0)
 
-#define TARGET_CHECK_ZERO_DIV   (!(target_flags & MASK_NO_CHECK_ZERO_DIV))
+#define TARGET_FIX_SB1         ((target_flags & MASK_FIX_SB1) != 0)
 
-#define TARGET_BRANCHLIKELY    (target_flags & MASK_BRANCHLIKELY)
+                                       /* Work around R4000 errata.  */
+#define TARGET_FIX_R4000       ((target_flags & MASK_FIX_R4000) != 0)
 
-#define TARGET_FIX_SB1         (target_flags & MASK_FIX_SB1)
+                                       /* Work around R4400 errata.  */
+#define TARGET_FIX_R4400       ((target_flags & MASK_FIX_R4400) != 0)
+#define TARGET_FIX_VR4120      ((target_flags & MASK_FIX_VR4120) != 0)
+#define TARGET_VR4130_ALIGN    ((target_flags & MASK_VR4130_ALIGN) != 0)
+
+#define TARGET_FP_EXCEPTIONS   ((target_flags & MASK_FP_EXCEPTIONS) != 0)
 
 /* True if we should use NewABI-style relocation operators for
    symbolic addresses.  This is never true for mips16 code,
    which has its own conventions.  */
 
-#define TARGET_EXPLICIT_RELOCS (target_flags & MASK_EXPLICIT_RELOCS)
+#define TARGET_EXPLICIT_RELOCS ((target_flags & MASK_EXPLICIT_RELOCS) != 0)
 
 
 /* True if the call patterns should be split into a jalr followed by
@@ -290,12 +281,25 @@ extern const struct mips_cpu_info *mips_tune_info;
   (!TARGET_MIPS16 && (!TARGET_ABICALLS || TARGET_EXPLICIT_RELOCS))
 
 /* True if .gpword or .gpdword should be used for switch tables.
-   Not all SGI assemblers support this.  */
+   There are some problems with using these directives with the
+   native IRIX tools:
+
+      - It has been reported that some versions of the native n32
+       assembler mishandle .gpword, complaining that symbols are
+       global when they are in fact local.
+
+      - The native assemblers don't understand .gpdword.
 
-#define TARGET_GPWORD (TARGET_ABICALLS && (!TARGET_NEWABI || TARGET_GAS))
+      - Although GAS does understand .gpdword, the native linker
+       mishandles the relocations GAS generates (R_MIPS_GPREL32
+       followed by R_MIPS_64).
+
+   We therefore disable GP-relative switch tables for n32 and n64
+   on IRIX targets.  */
+#define TARGET_GPWORD (TARGET_ABICALLS && !(TARGET_NEWABI && TARGET_IRIX))
 
                                        /* Generate mips16 code */
-#define TARGET_MIPS16          (target_flags & MASK_MIPS16)
+#define TARGET_MIPS16          ((target_flags & MASK_MIPS16) != 0)
 
 /* Generic ISA defines.  */
 #define ISA_MIPS1                  (mips_isa == 1)
@@ -309,22 +313,20 @@ extern const struct mips_cpu_info *mips_tune_info;
 /* Architecture target defines.  */
 #define TARGET_MIPS3900             (mips_arch == PROCESSOR_R3900)
 #define TARGET_MIPS4000             (mips_arch == PROCESSOR_R4000)
-#define TARGET_MIPS4100             (mips_arch == PROCESSOR_R4100)
 #define TARGET_MIPS4120             (mips_arch == PROCESSOR_R4120)
-#define TARGET_MIPS4300             (mips_arch == PROCESSOR_R4300)
-#define TARGET_MIPS4KC              (mips_arch == PROCESSOR_4KC)
-#define TARGET_MIPS5KC              (mips_arch == PROCESSOR_5KC)
+#define TARGET_MIPS4130             (mips_arch == PROCESSOR_R4130)
 #define TARGET_MIPS5400             (mips_arch == PROCESSOR_R5400)
 #define TARGET_MIPS5500             (mips_arch == PROCESSOR_R5500)
 #define TARGET_MIPS7000             (mips_arch == PROCESSOR_R7000)
 #define TARGET_MIPS9000             (mips_arch == PROCESSOR_R9000)
-#define TARGET_SB1                  (mips_arch == PROCESSOR_SB1)
 #define TARGET_SR71K                (mips_arch == PROCESSOR_SR71000)
 
 /* Scheduling target defines.  */
 #define TUNE_MIPS3000               (mips_tune == PROCESSOR_R3000)
 #define TUNE_MIPS3900               (mips_tune == PROCESSOR_R3900)
 #define TUNE_MIPS4000               (mips_tune == PROCESSOR_R4000)
+#define TUNE_MIPS4120               (mips_tune == PROCESSOR_R4120)
+#define TUNE_MIPS4130               (mips_tune == PROCESSOR_R4130)
 #define TUNE_MIPS5000               (mips_tune == PROCESSOR_R5000)
 #define TUNE_MIPS5400               (mips_tune == PROCESSOR_R5400)
 #define TUNE_MIPS5500               (mips_tune == PROCESSOR_R5500)
@@ -332,10 +334,50 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define TUNE_MIPS7000               (mips_tune == PROCESSOR_R7000)
 #define TUNE_MIPS9000               (mips_tune == PROCESSOR_R9000)
 #define TUNE_SB1                    (mips_tune == PROCESSOR_SB1)
-#define TUNE_SR71K                  (mips_tune == PROCESSOR_SR71000)
 
+/* True if the pre-reload scheduler should try to create chains of
+   multiply-add or multiply-subtract instructions.  For example,
+   suppose we have:
+
+       t1 = a * b
+       t2 = t1 + c * d
+       t3 = e * f
+       t4 = t3 - g * h
+
+   t1 will have a higher priority than t2 and t3 will have a higher
+   priority than t4.  However, before reload, there is no dependence
+   between t1 and t3, and they can often have similar priorities.
+   The scheduler will then tend to prefer:
+
+       t1 = a * b
+       t3 = e * f
+       t2 = t1 + c * d
+       t4 = t3 - g * h
+
+   which stops us from making full use of macc/madd-style instructions.
+   This sort of situation occurs frequently in Fourier transforms and
+   in unrolled loops.
+
+   To counter this, the TUNE_MACC_CHAINS code will reorder the ready
+   queue so that chained multiply-add and multiply-subtract instructions
+   appear ahead of any other instruction that is likely to clobber lo.
+   In the example above, if t2 and t3 become ready at the same time,
+   the code ensures that t2 is scheduled first.
+
+   Multiply-accumulate instructions are a bigger win for some targets
+   than others, so this macro is defined on an opt-in basis.  */
+#define TUNE_MACC_CHAINS           (TUNE_MIPS5500              \
+                                    || TUNE_MIPS4120           \
+                                    || TUNE_MIPS4130)
+
+#define TARGET_OLDABI              (mips_abi == ABI_32 || mips_abi == ABI_O64)
 #define TARGET_NEWABI              (mips_abi == ABI_N32 || mips_abi == ABI_64)
 
+/* IRIX specific stuff.  */
+#define TARGET_IRIX       0
+#define TARGET_IRIX5      0
+#define TARGET_SGI_O32_AS  (TARGET_IRIX && mips_abi == ABI_32 && !TARGET_GAS)
+
 /* Define preprocessor macros for the -march and -mtune options.
    PREFIX is either _MIPS_ARCH or _MIPS_TUNE, INFO is the selected
    processor.  If INFO's canonical name is "foo", define PREFIX to
@@ -471,7 +513,7 @@ extern const struct mips_cpu_info *mips_tune_info;
         {                                                      \
          builtin_define ("_LANGUAGE_OBJECTIVE_C");             \
           builtin_define ("__LANGUAGE_OBJECTIVE_C");           \
-         /* Bizzare, but needed at least for Irix.  */         \
+         /* Bizarre, but needed at least for Irix.  */         \
          builtin_define_std ("LANGUAGE_C");                    \
          builtin_define ("_LANGUAGE_C");                       \
         }                                                      \
@@ -506,10 +548,6 @@ extern const struct mips_cpu_info *mips_tune_info;
      N_("Use MIPS as")},                                               \
   {"gas",                MASK_GAS,                                     \
      N_("Use GNU as")},                                                        \
-  {"rnames",             MASK_NAME_REGS,                               \
-     N_("Use symbolic register names")},                               \
-  {"no-rnames",                 -MASK_NAME_REGS,                               \
-     N_("Don't use symbolic register names")},                         \
   {"gpOPT",              0,                                            \
      N_("Use GP relative sdata/sbss sections (now ignored)")},         \
   {"gpopt",              0,                                            \
@@ -550,10 +588,6 @@ extern const struct mips_cpu_info *mips_tune_info;
      N_("Use indirect calls")},                                                \
   {"no-long-calls",     -MASK_LONG_CALLS,                              \
      N_("Don't use indirect calls")},                                  \
-  {"embedded-pic",       MASK_EMBEDDED_PIC,                            \
-     N_("Use embedded PIC")},                                          \
-  {"no-embedded-pic",   -MASK_EMBEDDED_PIC,                            \
-     N_("Don't use embedded PIC")},                                    \
   {"embedded-data",      MASK_EMBEDDED_DATA,                           \
      N_("Use ROM instead of RAM")},                                    \
   {"no-embedded-data",  -MASK_EMBEDDED_DATA,                           \
@@ -578,6 +612,10 @@ extern const struct mips_cpu_info *mips_tune_info;
      N_("Don't generate fused multiply/add instructions")},            \
   {"fused-madd",         -MASK_NO_FUSED_MADD,                           \
      N_("Generate fused multiply/add instructions")},                  \
+  {"vr4130-align",       MASK_VR4130_ALIGN,                            \
+     N_("Perform VR4130-specific alignment optimizations")},           \
+  {"no-vr4130-align",   -MASK_VR4130_ALIGN,                            \
+     N_("Don't perform VR4130-specific alignment optimizations")},     \
   {"fix4300",             MASK_4300_MUL_FIX,                           \
      N_("Work around early 4300 hardware bug")},                       \
   {"no-fix4300",         -MASK_4300_MUL_FIX,                           \
@@ -586,6 +624,18 @@ extern const struct mips_cpu_info *mips_tune_info;
      N_("Work around errata for early SB-1 revision 2 cores")},                \
   {"no-fix-sb1",         -MASK_FIX_SB1,                                        \
      N_("Don't work around errata for early SB-1 revision 2 cores")},  \
+  {"fix-r4000",                  MASK_FIX_R4000,                               \
+     N_("Work around R4000 errata")},                                  \
+  {"no-fix-r4000",      -MASK_FIX_R4000,                               \
+     N_("Don't work around R4000 errata")},                            \
+  {"fix-r4400",                  MASK_FIX_R4400,                               \
+     N_("Work around R4400 errata")},                                  \
+  {"no-fix-r4400",      -MASK_FIX_R4400,                               \
+     N_("Don't work around R4400 errata")},                            \
+  {"fix-vr4120",         MASK_FIX_VR4120,                              \
+     N_("Work around certain VR4120 errata")},                         \
+  {"no-fix-vr4120",     -MASK_FIX_VR4120,                              \
+     N_("Don't work around certain VR4120 errata")},                   \
   {"check-zero-division",-MASK_NO_CHECK_ZERO_DIV,                      \
      N_("Trap on integer divide by zero")},                            \
   {"no-check-zero-division", MASK_NO_CHECK_ZERO_DIV,                   \
@@ -606,27 +656,18 @@ extern const struct mips_cpu_info *mips_tune_info;
      N_("Lift restrictions on GOT size") },                            \
   {"no-xgot",           -MASK_XGOT,                                    \
      N_("Do not lift restrictions on GOT size") },                     \
+  {"fp-exceptions",      MASK_FP_EXCEPTIONS,                           \
+     N_("FP exceptions are enabled") },                                        \
+  {"no-fp-exceptions",           -MASK_FP_EXCEPTIONS,                          \
+     N_("FP exceptions are not enabled") },                            \
   {"debug",              MASK_DEBUG,                                   \
      NULL},                                                            \
-  {"debuga",             MASK_DEBUG_A,                                 \
-     NULL},                                                            \
-  {"debugb",             MASK_DEBUG_B,                                 \
-     NULL},                                                            \
-  {"debugc",             MASK_DEBUG_C,                                 \
-     NULL},                                                            \
   {"debugd",             MASK_DEBUG_D,                                 \
      NULL},                                                            \
-  {"debuge",             MASK_DEBUG_E,                                 \
-     NULL},                                                            \
-  {"debugf",             MASK_DEBUG_F,                                 \
-     NULL},                                                            \
-  {"debugg",             MASK_DEBUG_G,                                 \
-     NULL},                                                            \
-  {"debugi",             MASK_DEBUG_I,                                 \
-     NULL},                                                            \
   {"",                   (TARGET_DEFAULT                               \
                           | TARGET_CPU_DEFAULT                         \
-                          | TARGET_ENDIAN_DEFAULT),                    \
+                          | TARGET_ENDIAN_DEFAULT                      \
+                          | TARGET_FP_EXCEPTIONS_DEFAULT),             \
      NULL},                                                            \
 }
 
@@ -644,6 +685,10 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN
 #endif
 
+#ifndef TARGET_FP_EXCEPTIONS_DEFAULT
+#define TARGET_FP_EXCEPTIONS_DEFAULT MASK_FP_EXCEPTIONS
+#endif
+
 /* 'from-abi' makes a good default: you get whatever the ABI requires.  */
 #ifndef MIPS_ISA_DEFAULT
 #ifndef MIPS_CPU_STRING_DEFAULT
@@ -780,9 +825,7 @@ extern const struct mips_cpu_info *mips_tune_info;
 /* True if the ABI can only work with 64-bit integer registers.  We
    generally allow ad-hoc variations for TARGET_SINGLE_FLOAT, but
    otherwise floating-point registers must also be 64-bit.  */
-#define ABI_NEEDS_64BIT_REGS   (mips_abi == ABI_64                     \
-                                || mips_abi == ABI_O64                 \
-                                || mips_abi == ABI_N32)
+#define ABI_NEEDS_64BIT_REGS   (TARGET_NEWABI || mips_abi == ABI_O64)
 
 /* Likewise for 32-bit regs.  */
 #define ABI_NEEDS_32BIT_REGS   (mips_abi == ABI_32)
@@ -799,8 +842,7 @@ extern const struct mips_cpu_info *mips_tune_info;
 /* ISA has branch likely instructions (eg. mips2).  */
 /* Disable branchlikely for tx39 until compare rewrite.  They haven't
    been generated up to this point.  */
-#define ISA_HAS_BRANCHLIKELY   (!ISA_MIPS1                             \
-                                && !TARGET_MIPS5500)
+#define ISA_HAS_BRANCHLIKELY   (!ISA_MIPS1)
 
 /* ISA has the conditional move instructions introduced in mips4.  */
 #define ISA_HAS_CONDMOVE        ((ISA_MIPS4                            \
@@ -877,6 +919,7 @@ extern const struct mips_cpu_info *mips_tune_info;
 /* ISA has three operand multiply instructions that  the result
    from a 4th operand and puts the result in an accumulator.  */
 #define ISA_HAS_MACC            ((TARGET_MIPS4120 && !TARGET_MIPS16)   \
+                                 || (TARGET_MIPS4130 && !TARGET_MIPS16)        \
                                  || TARGET_MIPS5400                     \
                                  || TARGET_MIPS5500                     \
                                  || TARGET_SR71K                        \
@@ -937,9 +980,21 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define ISA_HAS_FCMP_DELAY     (mips_isa <= 3)
 
 /* True if mflo and mfhi can be immediately followed by instructions
-   which write to the HI and LO registers.  Most targets require a
-   two-instruction gap.  */
-#define ISA_HAS_HILO_INTERLOCKS        (TARGET_MIPS5500 || TARGET_SB1)
+   which write to the HI and LO registers.
+
+   According to MIPS specifications, MIPS ISAs I, II, and III need
+   (at least) two instructions between the reads of HI/LO and
+   instructions which write them, and later ISAs do not.  Contradicting
+   the MIPS specifications, some MIPS IV processor user manuals (e.g.
+   the UM for the NEC Vr5000) document needing the instructions between
+   HI/LO reads and writes, as well.  Therefore, we declare only MIPS32,
+   MIPS64 and later ISAs to have the interlocks, plus any specific
+   earlier-ISA CPUs for which CPU documentation declares that the
+   instructions are really interlocked.  */
+#define ISA_HAS_HILO_INTERLOCKS        (ISA_MIPS32                             \
+                                || ISA_MIPS32R2                        \
+                                || ISA_MIPS64                          \
+                                || TARGET_MIPS5500)
 \f
 /* Add -G xx support.  */
 
@@ -1061,10 +1116,11 @@ extern const struct mips_cpu_info *mips_tune_info;
 #endif
 
 /* Beginning with gas 2.13, -mdebug must be passed to correctly handle COFF
-   and stabs debugging info.  */
+   debugging info.  */
 #if ((TARGET_CPU_DEFAULT | TARGET_DEFAULT) & MASK_GAS) != 0
 /* GAS */
-#define MDEBUG_ASM_SPEC "%{!gdwarf*:-mdebug} %{gdwarf*:-no-mdebug}"
+#define MDEBUG_ASM_SPEC "%{gcoff*:-mdebug} \
+                         %{!gcoff*:-no-mdebug}"
 #else /* not GAS */
 #define MDEBUG_ASM_SPEC ""
 #endif /* not GAS */
@@ -1087,9 +1143,9 @@ extern const struct mips_cpu_info *mips_tune_info;
 %{G*} %(endian_spec) %{mips1} %{mips2} %{mips3} %{mips4} \
 %{mips32} %{mips32r2} %{mips64} \
 %{mips16:%{!mno-mips16:-mips16}} %{mno-mips16:-no-mips16} \
+%{mfix-vr4120} \
 %(subtarget_asm_optimizing_spec) \
 %(subtarget_asm_debugging_spec) \
-%{membedded-pic} \
 %{mabi=32:-32}%{mabi=n32:-n32}%{mabi=64:-64}%{mabi=n64:-64} \
 %{mabi=eabi} %{mabi=o64} %{!mabi*: %(asm_abi_default_spec)} \
 %{mgp32} %{mgp64} %{march=*} %{mxgot:-xgot} \
@@ -1179,6 +1235,13 @@ extern const struct mips_cpu_info *mips_tune_info;
 \f
 #define DBX_DEBUGGING_INFO 1           /* generate stabs (OSF/rose) */
 #define MIPS_DEBUGGING_INFO 1          /* MIPS specific debugging info */
+#define DWARF2_DEBUGGING_INFO 1         /* dwarf2 debugging info */
+
+#ifndef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+#endif
+
+#define DWARF2_ADDR_SIZE (ABI_HAS_64BIT_SYMBOLS ? 8 : 4)
 
 /* By default, turn on GDB extensions.  */
 #define DEFAULT_GDB_EXTENSIONS 1
@@ -1216,11 +1279,14 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define DBX_REGISTER_NUMBER(REGNO) mips_dbx_regno[ (REGNO) ]
 
 /* The mapping from gcc register number to DWARF 2 CFA column number.  */
-#define DWARF_FRAME_REGNUM(REG)                                \
-  (REG == GP_REG_FIRST + 31 ? DWARF_FRAME_RETURN_COLUMN : REG)
+#define DWARF_FRAME_REGNUM(REG)        (REG)
 
 /* The DWARF 2 CFA column which tracks the return address.  */
-#define DWARF_FRAME_RETURN_COLUMN (FP_REG_LAST + 1)
+#define DWARF_FRAME_RETURN_COLUMN (GP_REG_FIRST + 31)
+
+/* The DWARF 2 CFA column which tracks the return address from a
+   signal handler context.  */
+#define SIGNAL_UNWIND_RETURN_COLUMN (FP_REG_LAST + 1)
 
 /* Before the prologue, RA lives in r31.  */
 #define INCOMING_RETURN_ADDR_RTX  gen_rtx_REG (VOIDmode, GP_REG_FIRST + 31)
@@ -1236,8 +1302,6 @@ extern const struct mips_cpu_info *mips_tune_info;
    SFmode register saves.  */
 #define DWARF_CIE_DATA_ALIGNMENT 4
 
-#define FIND_BASE_TERM(X) mips_delegitimize_address (X)
-
 /* Correct the offset of automatic variables and arguments.  Note that
    the MIPS debug format wants all automatic variables and arguments
    to be in terms of the virtual frame pointer (stack pointer before
@@ -1283,31 +1347,23 @@ extern const struct mips_cpu_info *mips_tune_info;
 
 /* The largest size of value that can be held in floating-point
    registers.  */
-#define UNITS_PER_FPVALUE \
-  (TARGET_SOFT_FLOAT ? 0 : (LONG_DOUBLE_TYPE_SIZE / BITS_PER_UNIT))
+#define UNITS_PER_FPVALUE                      \
+  (TARGET_SOFT_FLOAT ? 0                       \
+   : TARGET_SINGLE_FLOAT ? UNITS_PER_FPREG     \
+   : LONG_DOUBLE_TYPE_SIZE / BITS_PER_UNIT)
 
 /* The number of bytes in a double.  */
 #define UNITS_PER_DOUBLE (TYPE_PRECISION (double_type_node) / BITS_PER_UNIT)
 
-/* Tell the preprocessor the maximum size of wchar_t.  */
-#ifndef MAX_WCHAR_TYPE_SIZE
-#ifndef WCHAR_TYPE_SIZE
-#define MAX_WCHAR_TYPE_SIZE 64
-#endif
-#endif
-
 /* Set the sizes of the core types.  */
 #define SHORT_TYPE_SIZE 16
 #define INT_TYPE_SIZE (TARGET_INT64 ? 64 : 32)
 #define LONG_TYPE_SIZE (TARGET_LONG64 ? 64 : 32)
 #define LONG_LONG_TYPE_SIZE 64
 
-#define MAX_LONG_TYPE_SIZE 64
-
 #define FLOAT_TYPE_SIZE 32
 #define DOUBLE_TYPE_SIZE 64
-#define LONG_DOUBLE_TYPE_SIZE \
-  (mips_abi == ABI_N32 || mips_abi == ABI_64 ? 128 : 64)
+#define LONG_DOUBLE_TYPE_SIZE (TARGET_NEWABI ? 128 : 64)
 
 /* long double is not a fixed mode, but the idea is that, if we
    support long double, we also want a 128-bit integer type.  */
@@ -1330,8 +1386,8 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define POINTERS_EXTEND_UNSIGNED 0
 
 /* Allocation boundary (in *bits*) for storing arguments in argument list.  */
-#define PARM_BOUNDARY ((mips_abi == ABI_O64 || mips_abi == ABI_N32 \
-                       || mips_abi == ABI_64 \
+#define PARM_BOUNDARY ((mips_abi == ABI_O64 \
+                       || TARGET_NEWABI \
                        || (mips_abi == ABI_EABI && TARGET_64BIT)) ? 64 : 32)
 
 
@@ -1412,10 +1468,6 @@ extern const struct mips_cpu_info *mips_tune_info;
 #define PAD_VARARGS_DOWN \
   (FUNCTION_ARG_PADDING (TYPE_MODE (type), type) == downward)
 
-/* Arguments declared as 'char' or 'short' in a prototype should be
-   passed as 'int's.  */
-#define PROMOTE_PROTOTYPES 1
-
 /* Define if operations between registers always perform the operation
    on the full register even if a narrower mode is specified.  */
 #define WORD_REGISTER_OPERATIONS
@@ -1443,15 +1495,6 @@ extern const struct mips_cpu_info *mips_tune_info;
 
 /* Define if loading short immediate values into registers sign extends.  */
 #define SHORT_IMMEDIATES_SIGN_EXTEND
-
-
-/* Define this if function arguments should also be promoted using the above
-   procedure.  */
-#define PROMOTE_FUNCTION_ARGS
-
-/* Likewise, if the function return value is promoted.  */
-#define PROMOTE_FUNCTION_RETURN
-
 \f
 /* Standard register usage.  */
 
@@ -1462,7 +1505,11 @@ extern const struct mips_cpu_info *mips_tune_info;
    - 8 condition code registers
    - 2 accumulator registers (hi and lo)
    - 32 registers each for coprocessors 0, 2 and 3
-   - 6 dummy entries that were used at various times in the past.  */
+   - 3 fake registers:
+       - ARG_POINTER_REGNUM
+       - FRAME_POINTER_REGNUM
+       - FAKE_CALL_REGNO (see the comment above load_callsi for details)
+   - 3 dummy entries that were used at various times in the past.  */
 
 #define FIRST_PSEUDO_REGISTER 176
 
@@ -1648,11 +1695,10 @@ extern char mips_hard_regno_mode_ok[][FIRST_PSEUDO_REGISTER];
 /* Register to use for pushing function arguments.  */
 #define STACK_POINTER_REGNUM (GP_REG_FIRST + 29)
 
-/* Base register for access to local variables of the function.  We
-   pretend that the frame pointer is $1, and then eliminate it to
-   HARD_FRAME_POINTER_REGNUM.  We can get away with this because $1 is
-   a fixed register, and will not be used for anything else.  */
-#define FRAME_POINTER_REGNUM (GP_REG_FIRST + 1)
+/* These two registers don't really exist: they get eliminated to either
+   the stack or hard frame pointer.  */
+#define ARG_POINTER_REGNUM 77
+#define FRAME_POINTER_REGNUM 78
 
 /* $30 is not available on the mips16, so we use $17 as the frame
    pointer.  */
@@ -1665,15 +1711,9 @@ extern char mips_hard_regno_mode_ok[][FIRST_PSEUDO_REGISTER];
    This is computed in `reload', in reload1.c.  */
 #define FRAME_POINTER_REQUIRED (current_function_calls_alloca)
 
-/* Base register for access to arguments of the function.  */
-#define ARG_POINTER_REGNUM GP_REG_FIRST
-
 /* Register in which static-chain is passed to a function.  */
 #define STATIC_CHAIN_REGNUM (GP_REG_FIRST + 2)
 
-/* Pass structure addresses as an "invisible" first argument.  */
-#define STRUCT_VALUE 0
-
 /* Registers used as temporaries in prologue/epilogue code.  If we're
    generating mips16 code, these registers must come from the core set
    of 8.  The prologue register mustn't conflict with any incoming
@@ -1691,11 +1731,6 @@ extern char mips_hard_regno_mode_ok[][FIRST_PSEUDO_REGISTER];
    function address than to call an address kept in a register.  */
 #define NO_FUNCTION_CSE 1
 
-/* Define this macro if it is as good or better for a function to
-   call itself with an explicit address than to call an address
-   kept in a register.  */
-#define NO_RECURSIVE_FUNCTION_CSE 1
-
 /* The ABI-defined global pointer.  Sometimes we use a different
    register in leaf functions: see PIC_OFFSET_TABLE_REGNUM.  */
 #define GLOBAL_POINTER_REGNUM (GP_REG_FIRST + 28)
@@ -1918,7 +1953,7 @@ extern const enum reg_class mips_regno_to_class[];
    'd'  General (aka integer) registers
         Normally this is GR_REGS, but in mips16 mode this is M16_REGS
    'y'  General registers (in both mips16 and non mips16 mode)
-   'e' mips16 non argument registers (M16_NA_REGS)
+   'e' Effective address registers (general registers except $25)
    't'  mips16 temporary register ($24)
    'f' Floating point registers
    'h' Hi register
@@ -2015,15 +2050,6 @@ extern enum reg_class mips_char_to_class[256];
   ((C) == 'G'                                                          \
    && (VALUE) == CONST0_RTX (GET_MODE (VALUE)))
 
-/* True if OP is a constant that should not be moved into $25.
-   We need this because many versions of gas treat 'la $25,foo' as
-   part of a call sequence and allow a global 'foo' to be lazily bound.  */
-
-#define DANGEROUS_FOR_LA25_P(OP)                                       \
-  (TARGET_ABICALLS                                                     \
-   && !TARGET_EXPLICIT_RELOCS                                          \
-   && mips_global_pic_constant_p (OP))
-
 /* Letters in the range `Q' through `U' may be defined in a
    machine-dependent fashion to stand for arbitrary operand types.
    The machine description macro `EXTRA_CONSTRAINT' is passed the
@@ -2037,7 +2063,7 @@ extern enum reg_class mips_char_to_class[256];
    `T' is for constant move_operands that cannot be safely loaded into $25.
    `U' is for constant move_operands that can be safely loaded into $25.
    `W' is for memory references that are based on a member of BASE_REG_CLASS.
-        This is true for all non-mips16 references (although it can somtimes
+        This is true for all non-mips16 references (although it can sometimes
         be indirect if !TARGET_EXPLICIT_RELOCS).  For mips16, it excludes
         stack and constant-pool references.  */
 
@@ -2049,10 +2075,10 @@ extern enum reg_class mips_char_to_class[256];
                             && call_insn_operand (OP, VOIDmode))       \
    : ((CODE) == 'T')     ? (CONSTANT_P (OP)                            \
                             && move_operand (OP, VOIDmode)             \
-                            && DANGEROUS_FOR_LA25_P (OP))              \
+                            && mips_dangerous_for_la25_p (OP))         \
    : ((CODE) == 'U')     ? (CONSTANT_P (OP)                            \
                             && move_operand (OP, VOIDmode)             \
-                            && !DANGEROUS_FOR_LA25_P (OP))             \
+                            && !mips_dangerous_for_la25_p (OP))        \
    : ((CODE) == 'W')     ? (GET_CODE (OP) == MEM                       \
                             && memory_operand (OP, VOIDmode)           \
                             && (!TARGET_MIPS16                         \
@@ -2063,27 +2089,8 @@ extern enum reg_class mips_char_to_class[256];
 /* Say which of the above are memory constraints.  */
 #define EXTRA_MEMORY_CONSTRAINT(C, STR) ((C) == 'R' || (C) == 'W')
 
-/* Given an rtx X being reloaded into a reg required to be
-   in class CLASS, return the class of reg to actually use.
-   In general this is just CLASS; but on some machines
-   in some cases it is preferable to use a more restrictive class.  */
-
 #define PREFERRED_RELOAD_CLASS(X,CLASS)                                        \
-  ((CLASS) != ALL_REGS                                                 \
-   ? (! TARGET_MIPS16                                                  \
-      ? (CLASS)                                                                \
-      : ((CLASS) != GR_REGS                                            \
-        ? (CLASS)                                                      \
-        : M16_REGS))                                                   \
-   : ((GET_MODE_CLASS (GET_MODE (X)) == MODE_FLOAT                     \
-       || GET_MODE_CLASS (GET_MODE (X)) == MODE_COMPLEX_FLOAT)         \
-      ? (TARGET_SOFT_FLOAT                                             \
-        ? (TARGET_MIPS16 ? M16_REGS : GR_REGS)                         \
-        : FP_REGS)                                                     \
-      : ((GET_MODE_CLASS (GET_MODE (X)) == MODE_INT                    \
-         || GET_MODE (X) == VOIDmode)                                  \
-        ? (TARGET_MIPS16 ? M16_REGS : GR_REGS)                         \
-        : (CLASS))))
+  mips_preferred_reload_class (X, CLASS)
 
 /* Certain machines have the property that some registers cannot be
    copied to some other registers without using memory.  Define this
@@ -2125,9 +2132,21 @@ extern enum reg_class mips_char_to_class[256];
 #define STACK_GROWS_DOWNWARD
 
 /* The offset of the first local variable from the beginning of the frame.
-   See compute_frame_size for details about the frame layout.  */
+   See compute_frame_size for details about the frame layout.
+
+   ??? If flag_profile_values is true, and we are generating 32-bit code, then
+   we assume that we will need 16 bytes of argument space.  This is because
+   the value profiling code may emit calls to cmpdi2 in leaf functions.
+   Without this hack, the local variables will start at sp+8 and the gp save
+   area will be at sp+16, and thus they will overlap.  compute_frame_size is
+   OK because it uses STARTING_FRAME_OFFSET to compute cprestore_size, which
+   will end up as 24 instead of 8.  This won't be needed if profiling code is
+   inserted before virtual register instantiation.  */
+
 #define STARTING_FRAME_OFFSET                                          \
-  (current_function_outgoing_args_size                                 \
+  ((flag_profile_values && ! TARGET_64BIT                              \
+    ? MAX (REG_PARM_STACK_SPACE(NULL), current_function_outgoing_args_size) \
+    : current_function_outgoing_args_size)                             \
    + (TARGET_ABICALLS && !TARGET_NEWABI                                        \
       ? MIPS_STACK_ALIGN (UNITS_PER_WORD) : 0))
 
@@ -2180,7 +2199,7 @@ extern enum reg_class mips_char_to_class[256];
 
 /* o32 and o64 reserve stack space for all argument registers.  */
 #define REG_PARM_STACK_SPACE(FNDECL)                   \
-  ((mips_abi == ABI_32 || mips_abi == ABI_O64)         \
+  (TARGET_OLDABI                                       \
    ? (MAX_ARGS_IN_REGISTERS * UNITS_PER_WORD)          \
    : 0)
 
@@ -2191,10 +2210,7 @@ extern enum reg_class mips_char_to_class[256];
    `current_function_outgoing_args_size'.  */
 #define OUTGOING_REG_PARM_STACK_SPACE
 
-#define STACK_BOUNDARY \
-  ((mips_abi == ABI_32 || mips_abi == ABI_O64 || mips_abi == ABI_EABI) \
-   ? 64 : 128)
-
+#define STACK_BOUNDARY ((TARGET_OLDABI || mips_abi == ABI_EABI) ? 64 : 128)
 \f
 #define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE) 0
 
@@ -2204,12 +2220,7 @@ extern enum reg_class mips_char_to_class[256];
 #define GP_RETURN (GP_REG_FIRST + 2)
 #define FP_RETURN ((TARGET_SOFT_FLOAT) ? GP_RETURN : (FP_REG_FIRST + 0))
 
-#define MAX_ARGS_IN_REGISTERS \
-  ((mips_abi == ABI_32 || mips_abi == ABI_O64) ? 4 : 8)
-
-/* Largest possible value of MAX_ARGS_IN_REGISTERS.  */
-
-#define BIGGEST_MAX_ARGS_IN_REGISTERS 8
+#define MAX_ARGS_IN_REGISTERS (TARGET_OLDABI ? 4 : 8)
 
 /* Symbolic macros for the first/last argument registers.  */
 
@@ -2226,7 +2237,7 @@ extern enum reg_class mips_char_to_class[256];
 
 /* 1 if N is a possible register number for a function value.
    On the MIPS, R2 R3 and F0 F2 are the only register thus used.
-   Currently, R2 and F0 are only implemented  here (C has no complex type)  */
+   Currently, R2 and F0 are only implemented here (C has no complex type)  */
 
 #define FUNCTION_VALUE_REGNO_P(N) ((N) == GP_RETURN || (N) == FP_RETURN \
   || (LONG_DOUBLE_TYPE_SIZE == 128 && FP_RETURN != GP_RETURN \
@@ -2238,18 +2249,9 @@ extern enum reg_class mips_char_to_class[256];
 
 #define FUNCTION_ARG_REGNO_P(N)                                        \
   ((IN_RANGE((N), GP_ARG_FIRST, GP_ARG_LAST)                   \
-    || (IN_RANGE((N), FP_ARG_FIRST, FP_ARG_LAST)               \
-       && ((N) % FP_INC == 0) && mips_abi != ABI_O64))         \
+    || (IN_RANGE((N), FP_ARG_FIRST, FP_ARG_LAST)))             \
    && !fixed_regs[N])
-
-#define RETURN_IN_MEMORY(TYPE) mips_return_in_memory (TYPE)
-
-#define SETUP_INCOMING_VARARGS(CUM,MODE,TYPE,PRETEND_SIZE,NO_RTL)      \
-       (PRETEND_SIZE) = mips_setup_incoming_varargs (&(CUM), (MODE),   \
-                                                     (TYPE), (NO_RTL))
 \f
-#define STRICT_ARGUMENT_NAMING (mips_abi != ABI_32 && mips_abi != ABI_O64)
-
 /* This structure has to cope with two different argument allocation
    schemes.  Most MIPS ABIs view the arguments as a struct, of which the
    first N words go in registers and the rest go on the stack.  If I < N,
@@ -2313,11 +2315,9 @@ typedef struct mips_args {
 
 /* Initialize a variable CUM of type CUMULATIVE_ARGS
    for a call to a function whose data type is FNTYPE.
-   For a library call, FNTYPE is 0.
-
-*/
+   For a library call, FNTYPE is 0.  */
 
-#define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME,INDIRECT)              \
+#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \
   init_cumulative_args (&CUM, FNTYPE, LIBNAME)                         \
 
 /* Update the data in CUM to advance over an argument
@@ -2363,9 +2363,6 @@ typedef struct mips_args {
                ? PARM_BOUNDARY                                         \
                : GET_MODE_ALIGNMENT(MODE)))
 
-#define FUNCTION_ARG_PASS_BY_REFERENCE(CUM, MODE, TYPE, NAMED)         \
-  function_arg_pass_by_reference (&CUM, MODE, TYPE, NAMED)
-
 #define FUNCTION_ARG_PADDING(MODE, TYPE)               \
   (mips_pad_arg_upward (MODE, TYPE) ? upward : downward)
 
@@ -2373,16 +2370,7 @@ typedef struct mips_args {
   (mips_pad_reg_upward (MODE, TYPE) ? upward : downward)
 
 #define FUNCTION_ARG_CALLEE_COPIES(CUM, MODE, TYPE, NAMED)             \
-  (mips_abi == ABI_EABI && (NAMED)                                     \
-   && FUNCTION_ARG_PASS_BY_REFERENCE (CUM, MODE, TYPE, NAMED))
-
-/* Modified version of the macro in expr.h.  Only return true if
-   the type has a variable size or if the front end requires it
-   to be passed by reference.  */
-#define MUST_PASS_IN_STACK(MODE,TYPE)                  \
-  ((TYPE) != 0                                         \
-   && (TREE_CODE (TYPE_SIZE (TYPE)) != INTEGER_CST     \
-       || TREE_ADDRESSABLE (TYPE)))
+  (mips_abi == ABI_EABI && (NAMED))
 
 /* True if using EABI and varargs can be passed in floating-point
    registers.  Under these conditions, we need a more complex form
@@ -2399,22 +2387,14 @@ typedef struct mips_args {
 /* Treat LOC as a byte offset from the stack pointer and round it up
    to the next fully-aligned offset.  */
 #define MIPS_STACK_ALIGN(LOC)                                          \
-  ((mips_abi == ABI_32 || mips_abi == ABI_O64 || mips_abi == ABI_EABI) \
+  ((TARGET_OLDABI || mips_abi == ABI_EABI)                             \
    ? ((LOC) + 7) & ~7                                                  \
    : ((LOC) + 15) & ~15)
 
 \f
-/* Define the `__builtin_va_list' type for the ABI.  */
-#define BUILD_VA_LIST_TYPE(VALIST) \
-  (VALIST) = mips_build_va_list ()
-
 /* Implement `va_start' for varargs and stdarg.  */
 #define EXPAND_BUILTIN_VA_START(valist, nextarg) \
   mips_va_start (valist, nextarg)
-
-/* Implement `va_arg'.  */
-#define EXPAND_BUILTIN_VA_ARG(valist, type) \
-  mips_va_arg (valist, type)
 \f
 /* Output assembler code to FILE to increment profiler label # LABELNO
    for profiling a function entry.  */
@@ -2426,7 +2406,7 @@ typedef struct mips_args {
   fprintf (FILE, "\t.set\tnoat\n");                                    \
   fprintf (FILE, "\tmove\t%s,%s\t\t# save current return address\n",   \
           reg_names[GP_REG_FIRST + 1], reg_names[GP_REG_FIRST + 31]);  \
-  if (mips_abi != ABI_N32 && mips_abi != ABI_64)                       \
+  if (!TARGET_NEWABI)                                                  \
     {                                                                  \
       fprintf (FILE,                                                   \
               "\t%s\t%s,%s,%d\t\t# _mcount pops 2 words from  stack\n", \
@@ -2516,10 +2496,8 @@ typedef struct mips_args {
                                                                            \
   func_addr = plus_constant (ADDR, 32);                                            \
   chain_addr = plus_constant (func_addr, GET_MODE_SIZE (ptr_mode));        \
-  emit_move_insn (gen_rtx_MEM (ptr_mode, func_addr),                       \
-                 gen_lowpart (ptr_mode, force_reg (Pmode, FUNC)));         \
-  emit_move_insn (gen_rtx_MEM (ptr_mode, chain_addr),                      \
-                 gen_lowpart (ptr_mode, force_reg (Pmode, CHAIN)));        \
+  emit_move_insn (gen_rtx_MEM (ptr_mode, func_addr), FUNC);                \
+  emit_move_insn (gen_rtx_MEM (ptr_mode, chain_addr), CHAIN);              \
                                                                            \
   /* Flush both caches.  We need to flush the data cache in case           \
      the system has a write-back cache.  */                                \
@@ -2533,31 +2511,9 @@ typedef struct mips_args {
 \f
 /* Addressing modes, and classification of registers for them.  */
 
-/* These assume that REGNO is a hard or pseudo reg number.
-   They give nonzero only if REGNO is a hard reg of the suitable class
-   or a pseudo reg currently allocated to a suitable hard reg.
-   These definitions are NOT overridden anywhere.  */
-
-#define BASE_REG_P(regno, mode)                                        \
-  (TARGET_MIPS16                                               \
-   ? (M16_REG_P (regno)                                                \
-      || (regno) == FRAME_POINTER_REGNUM                       \
-      || (regno) == ARG_POINTER_REGNUM                         \
-      || ((regno) == STACK_POINTER_REGNUM                      \
-         && (GET_MODE_SIZE (mode) == 4                         \
-             || GET_MODE_SIZE (mode) == 8)))                   \
-   : GP_REG_P (regno))
-
-#define GP_REG_OR_PSEUDO_STRICT_P(regno, mode)                             \
-  BASE_REG_P((regno < FIRST_PSEUDO_REGISTER) ? (int) regno : reg_renumber[regno], \
-            (mode))
-
-#define GP_REG_OR_PSEUDO_NONSTRICT_P(regno, mode) \
-  (((regno) >= FIRST_PSEUDO_REGISTER) || (BASE_REG_P ((regno), (mode))))
-
-#define REGNO_OK_FOR_INDEX_P(regno)    0
-#define REGNO_MODE_OK_FOR_BASE_P(regno, mode) \
-  GP_REG_OR_PSEUDO_STRICT_P ((regno), (mode))
+#define REGNO_OK_FOR_INDEX_P(REGNO) 0
+#define REGNO_MODE_OK_FOR_BASE_P(REGNO, MODE) \
+  mips_regno_mode_ok_for_base_p (REGNO, MODE, 1)
 
 /* The macros REG_OK_FOR..._P assume that the arg is a REG rtx
    and check its validity for a certain class.
@@ -2572,10 +2528,10 @@ typedef struct mips_args {
 
 #ifndef REG_OK_STRICT
 #define REG_MODE_OK_FOR_BASE_P(X, MODE) \
-  mips_reg_mode_ok_for_base_p (X, MODE, 0)
+  mips_regno_mode_ok_for_base_p (REGNO (X), MODE, 0)
 #else
 #define REG_MODE_OK_FOR_BASE_P(X, MODE) \
-  mips_reg_mode_ok_for_base_p (X, MODE, 1)
+  mips_regno_mode_ok_for_base_p (REGNO (X), MODE, 1)
 #endif
 
 #define REG_OK_FOR_INDEX_P(X) 0
@@ -2585,21 +2541,6 @@ typedef struct mips_args {
 
 #define MAX_REGS_PER_ADDRESS 1
 
-/* A C compound statement with a conditional `goto LABEL;' executed
-   if X (an RTX) is a legitimate memory address on the target
-   machine for a memory operand of mode MODE.  */
-
-#if 1
-#define GO_PRINTF(x)   fprintf(stderr, (x))
-#define GO_PRINTF2(x,y)        fprintf(stderr, (x), (y))
-#define GO_DEBUG_RTX(x) debug_rtx(x)
-
-#else
-#define GO_PRINTF(x)
-#define GO_PRINTF2(x,y)
-#define GO_DEBUG_RTX(x)
-#endif
-
 #ifdef REG_OK_STRICT
 #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR)        \
 {                                              \
@@ -2653,18 +2594,10 @@ typedef struct mips_args {
                 XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \
   else                                                                 \
     asm_fprintf ((FILE), "%U%s", (NAME))
-
-/* The mips16 wants the constant pool to be after the function,
-   because the PC relative load instructions use unsigned offsets.  */
-
-#define CONSTANT_POOL_BEFORE_FUNCTION (! TARGET_MIPS16)
-
-#define ASM_OUTPUT_POOL_EPILOGUE(FILE, FNNAME, FNDECL, SIZE)   \
-  mips_string_length = 0;
 \f
 /* Specify the machine mode that this machine uses
    for the index in the tablejump instruction.
-   ??? Using HImode in mips16 mode can cause overflow. */
+   ??? Using HImode in mips16 mode can cause overflow.  */
 #define CASE_VECTOR_MODE \
   (TARGET_MIPS16 ? HImode : ptr_mode)
 
@@ -2738,7 +2671,7 @@ typedef struct mips_args {
    that the constraints of the insn are met.  Setting a cost of
    other than 2 will allow reload to verify that the constraints are
    met.  You should do this if the `movM' pattern's constraints do
-   not allow such copying. */
+   not allow such copying.  */
 
 #define REGISTER_MOVE_COST(MODE, FROM, TO)                             \
   mips_register_move_cost (MODE, FROM, TO)
@@ -2761,7 +2694,7 @@ typedef struct mips_args {
 /* ??? Fix this to be right for the R8000.  */
 #define BRANCH_COST                                                    \
   ((! TARGET_MIPS16                                                    \
-    && (TUNE_MIPS4000 || TUNE_MIPS6000))       \
+    && (TUNE_MIPS4000 || TUNE_MIPS6000))                               \
    ? 2 : 1)
 
 /* If defined, modifies the length assigned to instruction INSN as a
@@ -2794,16 +2727,19 @@ typedef struct mips_args {
    macro are thoses used in the most insn patterns.  */
 
 #define PREDICATE_CODES                                                        \
-  {"uns_arith_operand",                { REG, CONST_INT, SUBREG, ADDRESSOF }}, \
+  {"uns_arith_operand",                { REG, CONST_INT, SUBREG }},            \
   {"symbolic_operand",         { CONST, SYMBOL_REF, LABEL_REF }},      \
-  {"const_arith_operand",      { CONST, CONST_INT }},                  \
-  {"arith_operand",            { REG, CONST_INT, CONST, SUBREG, ADDRESSOF }},  \
-  {"reg_or_0_operand",         { REG, CONST_INT, CONST_DOUBLE, SUBREG, ADDRESSOF }}, \
+  {"general_symbolic_operand", { CONST, SYMBOL_REF, LABEL_REF }},      \
+  {"global_got_operand",       { CONST, SYMBOL_REF, LABEL_REF }},      \
+  {"local_got_operand",                { CONST, SYMBOL_REF, LABEL_REF }},      \
+  {"const_arith_operand",      { CONST_INT }},                         \
+  {"small_data_pattern",       { SET, PARALLEL, UNSPEC,                \
+                                 UNSPEC_VOLATILE }},                   \
+  {"arith_operand",            { REG, CONST_INT, CONST, SUBREG }},     \
+  {"reg_or_0_operand",         { REG, CONST_INT, CONST_DOUBLE, SUBREG }}, \
   {"small_int",                        { CONST_INT }},                         \
-  {"mips_const_double_ok",     { CONST_DOUBLE }},                      \
   {"const_float_1_operand",    { CONST_DOUBLE }},                      \
   {"reg_or_const_float_1_operand", { CONST_DOUBLE, REG}},               \
-  {"simple_memory_operand",    { MEM, SUBREG }},                       \
   {"equality_op",              { EQ, NE }},                            \
   {"cmp_op",                   { EQ, NE, GT, GE, GTU, GEU, LT, LE,     \
                                  LTU, LEU }},                          \
@@ -2818,6 +2754,7 @@ typedef struct mips_args {
                                  CONST_DOUBLE, CONST }},               \
   {"fcc_register_operand",     { REG, SUBREG }},                       \
   {"hilo_operand",             { REG }},                               \
+  {"macc_msac_operand",                { PLUS, MINUS }},                       \
   {"extend_operator",          { ZERO_EXTEND, SIGN_EXTEND }},
 
 /* A list of predicates that do special things with modes, and so
@@ -2842,237 +2779,37 @@ typedef struct mips_args {
 #define ASM_APP_OFF " #NO_APP\n"
 #endif
 
-/* How to refer to registers in assembler output.
-   This sequence is indexed by compiler's hard-register-number (see above).
-
-   In order to support the two different conventions for register names,
-   we use the name of a table set up in mips.c, which is overwritten
-   if -mrnames is used.  */
-
-#define REGISTER_NAMES                                                 \
-{                                                                      \
-  &mips_reg_names[ 0][0],                                              \
-  &mips_reg_names[ 1][0],                                              \
-  &mips_reg_names[ 2][0],                                              \
-  &mips_reg_names[ 3][0],                                              \
-  &mips_reg_names[ 4][0],                                              \
-  &mips_reg_names[ 5][0],                                              \
-  &mips_reg_names[ 6][0],                                              \
-  &mips_reg_names[ 7][0],                                              \
-  &mips_reg_names[ 8][0],                                              \
-  &mips_reg_names[ 9][0],                                              \
-  &mips_reg_names[10][0],                                              \
-  &mips_reg_names[11][0],                                              \
-  &mips_reg_names[12][0],                                              \
-  &mips_reg_names[13][0],                                              \
-  &mips_reg_names[14][0],                                              \
-  &mips_reg_names[15][0],                                              \
-  &mips_reg_names[16][0],                                              \
-  &mips_reg_names[17][0],                                              \
-  &mips_reg_names[18][0],                                              \
-  &mips_reg_names[19][0],                                              \
-  &mips_reg_names[20][0],                                              \
-  &mips_reg_names[21][0],                                              \
-  &mips_reg_names[22][0],                                              \
-  &mips_reg_names[23][0],                                              \
-  &mips_reg_names[24][0],                                              \
-  &mips_reg_names[25][0],                                              \
-  &mips_reg_names[26][0],                                              \
-  &mips_reg_names[27][0],                                              \
-  &mips_reg_names[28][0],                                              \
-  &mips_reg_names[29][0],                                              \
-  &mips_reg_names[30][0],                                              \
-  &mips_reg_names[31][0],                                              \
-  &mips_reg_names[32][0],                                              \
-  &mips_reg_names[33][0],                                              \
-  &mips_reg_names[34][0],                                              \
-  &mips_reg_names[35][0],                                              \
-  &mips_reg_names[36][0],                                              \
-  &mips_reg_names[37][0],                                              \
-  &mips_reg_names[38][0],                                              \
-  &mips_reg_names[39][0],                                              \
-  &mips_reg_names[40][0],                                              \
-  &mips_reg_names[41][0],                                              \
-  &mips_reg_names[42][0],                                              \
-  &mips_reg_names[43][0],                                              \
-  &mips_reg_names[44][0],                                              \
-  &mips_reg_names[45][0],                                              \
-  &mips_reg_names[46][0],                                              \
-  &mips_reg_names[47][0],                                              \
-  &mips_reg_names[48][0],                                              \
-  &mips_reg_names[49][0],                                              \
-  &mips_reg_names[50][0],                                              \
-  &mips_reg_names[51][0],                                              \
-  &mips_reg_names[52][0],                                              \
-  &mips_reg_names[53][0],                                              \
-  &mips_reg_names[54][0],                                              \
-  &mips_reg_names[55][0],                                              \
-  &mips_reg_names[56][0],                                              \
-  &mips_reg_names[57][0],                                              \
-  &mips_reg_names[58][0],                                              \
-  &mips_reg_names[59][0],                                              \
-  &mips_reg_names[60][0],                                              \
-  &mips_reg_names[61][0],                                              \
-  &mips_reg_names[62][0],                                              \
-  &mips_reg_names[63][0],                                              \
-  &mips_reg_names[64][0],                                              \
-  &mips_reg_names[65][0],                                              \
-  &mips_reg_names[66][0],                                              \
-  &mips_reg_names[67][0],                                              \
-  &mips_reg_names[68][0],                                              \
-  &mips_reg_names[69][0],                                              \
-  &mips_reg_names[70][0],                                              \
-  &mips_reg_names[71][0],                                              \
-  &mips_reg_names[72][0],                                              \
-  &mips_reg_names[73][0],                                              \
-  &mips_reg_names[74][0],                                              \
-  &mips_reg_names[75][0],                                              \
-  &mips_reg_names[76][0],                                              \
-  &mips_reg_names[77][0],                                              \
-  &mips_reg_names[78][0],                                              \
-  &mips_reg_names[79][0],                                              \
-  &mips_reg_names[80][0],                                              \
-  &mips_reg_names[81][0],                                              \
-  &mips_reg_names[82][0],                                              \
-  &mips_reg_names[83][0],                                              \
-  &mips_reg_names[84][0],                                              \
-  &mips_reg_names[85][0],                                              \
-  &mips_reg_names[86][0],                                              \
-  &mips_reg_names[87][0],                                              \
-  &mips_reg_names[88][0],                                              \
-  &mips_reg_names[89][0],                                              \
-  &mips_reg_names[90][0],                                              \
-  &mips_reg_names[91][0],                                              \
-  &mips_reg_names[92][0],                                              \
-  &mips_reg_names[93][0],                                              \
-  &mips_reg_names[94][0],                                              \
-  &mips_reg_names[95][0],                                              \
-  &mips_reg_names[96][0],                                              \
-  &mips_reg_names[97][0],                                              \
-  &mips_reg_names[98][0],                                              \
-  &mips_reg_names[99][0],                                              \
-  &mips_reg_names[100][0],                                             \
-  &mips_reg_names[101][0],                                             \
-  &mips_reg_names[102][0],                                             \
-  &mips_reg_names[103][0],                                             \
-  &mips_reg_names[104][0],                                             \
-  &mips_reg_names[105][0],                                             \
-  &mips_reg_names[106][0],                                             \
-  &mips_reg_names[107][0],                                             \
-  &mips_reg_names[108][0],                                             \
-  &mips_reg_names[109][0],                                             \
-  &mips_reg_names[110][0],                                             \
-  &mips_reg_names[111][0],                                             \
-  &mips_reg_names[112][0],                                             \
-  &mips_reg_names[113][0],                                             \
-  &mips_reg_names[114][0],                                             \
-  &mips_reg_names[115][0],                                             \
-  &mips_reg_names[116][0],                                             \
-  &mips_reg_names[117][0],                                             \
-  &mips_reg_names[118][0],                                             \
-  &mips_reg_names[119][0],                                             \
-  &mips_reg_names[120][0],                                             \
-  &mips_reg_names[121][0],                                             \
-  &mips_reg_names[122][0],                                             \
-  &mips_reg_names[123][0],                                             \
-  &mips_reg_names[124][0],                                             \
-  &mips_reg_names[125][0],                                             \
-  &mips_reg_names[126][0],                                             \
-  &mips_reg_names[127][0],                                             \
-  &mips_reg_names[128][0],                                             \
-  &mips_reg_names[129][0],                                             \
-  &mips_reg_names[130][0],                                             \
-  &mips_reg_names[131][0],                                             \
-  &mips_reg_names[132][0],                                             \
-  &mips_reg_names[133][0],                                             \
-  &mips_reg_names[134][0],                                             \
-  &mips_reg_names[135][0],                                             \
-  &mips_reg_names[136][0],                                             \
-  &mips_reg_names[137][0],                                             \
-  &mips_reg_names[138][0],                                             \
-  &mips_reg_names[139][0],                                             \
-  &mips_reg_names[140][0],                                             \
-  &mips_reg_names[141][0],                                             \
-  &mips_reg_names[142][0],                                             \
-  &mips_reg_names[143][0],                                             \
-  &mips_reg_names[144][0],                                             \
-  &mips_reg_names[145][0],                                             \
-  &mips_reg_names[146][0],                                             \
-  &mips_reg_names[147][0],                                             \
-  &mips_reg_names[148][0],                                             \
-  &mips_reg_names[149][0],                                             \
-  &mips_reg_names[150][0],                                             \
-  &mips_reg_names[151][0],                                             \
-  &mips_reg_names[152][0],                                             \
-  &mips_reg_names[153][0],                                             \
-  &mips_reg_names[154][0],                                             \
-  &mips_reg_names[155][0],                                             \
-  &mips_reg_names[156][0],                                             \
-  &mips_reg_names[157][0],                                             \
-  &mips_reg_names[158][0],                                             \
-  &mips_reg_names[159][0],                                             \
-  &mips_reg_names[160][0],                                             \
-  &mips_reg_names[161][0],                                             \
-  &mips_reg_names[162][0],                                             \
-  &mips_reg_names[163][0],                                             \
-  &mips_reg_names[164][0],                                             \
-  &mips_reg_names[165][0],                                             \
-  &mips_reg_names[166][0],                                             \
-  &mips_reg_names[167][0],                                             \
-  &mips_reg_names[168][0],                                             \
-  &mips_reg_names[169][0],                                             \
-  &mips_reg_names[170][0],                                             \
-  &mips_reg_names[171][0],                                             \
-  &mips_reg_names[172][0],                                             \
-  &mips_reg_names[173][0],                                             \
-  &mips_reg_names[174][0],                                             \
-  &mips_reg_names[175][0]                                              \
-}
-
-/* If defined, a C initializer for an array of structures
-   containing a name and a register number.  This macro defines
-   additional names for hard registers, thus allowing the `asm'
-   option in declarations to refer to registers using alternate
-   names.
-
-   We define both names for the integer registers here.  */
+#define REGISTER_NAMES                                                    \
+{ "$0",   "$1",   "$2",   "$3",   "$4",   "$5",   "$6",   "$7",                   \
+  "$8",   "$9",   "$10",  "$11",  "$12",  "$13",  "$14",  "$15",          \
+  "$16",  "$17",  "$18",  "$19",  "$20",  "$21",  "$22",  "$23",          \
+  "$24",  "$25",  "$26",  "$27",  "$28",  "$sp",  "$fp",  "$31",          \
+  "$f0",  "$f1",  "$f2",  "$f3",  "$f4",  "$f5",  "$f6",  "$f7",          \
+  "$f8",  "$f9",  "$f10", "$f11", "$f12", "$f13", "$f14", "$f15",         \
+  "$f16", "$f17", "$f18", "$f19", "$f20", "$f21", "$f22", "$f23",         \
+  "$f24", "$f25", "$f26", "$f27", "$f28", "$f29", "$f30", "$f31",         \
+  "hi",   "lo",   "",     "$fcc0","$fcc1","$fcc2","$fcc3","$fcc4",        \
+  "$fcc5","$fcc6","$fcc7","", "", "$arg", "$frame", "$fakec",             \
+  "$c0r0", "$c0r1", "$c0r2", "$c0r3", "$c0r4", "$c0r5", "$c0r6", "$c0r7",  \
+  "$c0r8", "$c0r9", "$c0r10","$c0r11","$c0r12","$c0r13","$c0r14","$c0r15", \
+  "$c0r16","$c0r17","$c0r18","$c0r19","$c0r20","$c0r21","$c0r22","$c0r23", \
+  "$c0r24","$c0r25","$c0r26","$c0r27","$c0r28","$c0r29","$c0r30","$c0r31", \
+  "$c2r0", "$c2r1", "$c2r2", "$c2r3", "$c2r4", "$c2r5", "$c2r6", "$c2r7",  \
+  "$c2r8", "$c2r9", "$c2r10","$c2r11","$c2r12","$c2r13","$c2r14","$c2r15", \
+  "$c2r16","$c2r17","$c2r18","$c2r19","$c2r20","$c2r21","$c2r22","$c2r23", \
+  "$c2r24","$c2r25","$c2r26","$c2r27","$c2r28","$c2r29","$c2r30","$c2r31", \
+  "$c3r0", "$c3r1", "$c3r2", "$c3r3", "$c3r4", "$c3r5", "$c3r6", "$c3r7",  \
+  "$c3r8", "$c3r9", "$c3r10","$c3r11","$c3r12","$c3r13","$c3r14","$c3r15", \
+  "$c3r16","$c3r17","$c3r18","$c3r19","$c3r20","$c3r21","$c3r22","$c3r23", \
+  "$c3r24","$c3r25","$c3r26","$c3r27","$c3r28","$c3r29","$c3r30","$c3r31" }
+
+/* List the "software" names for each register.  Also list the numerical
+   names for $fp and $sp.  */
 
 #define ADDITIONAL_REGISTER_NAMES                                      \
 {                                                                      \
-  { "$0",       0 + GP_REG_FIRST },                                    \
-  { "$1",       1 + GP_REG_FIRST },                                    \
-  { "$2",       2 + GP_REG_FIRST },                                    \
-  { "$3",       3 + GP_REG_FIRST },                                    \
-  { "$4",       4 + GP_REG_FIRST },                                    \
-  { "$5",       5 + GP_REG_FIRST },                                    \
-  { "$6",       6 + GP_REG_FIRST },                                    \
-  { "$7",       7 + GP_REG_FIRST },                                    \
-  { "$8",       8 + GP_REG_FIRST },                                    \
-  { "$9",       9 + GP_REG_FIRST },                                    \
-  { "$10",     10 + GP_REG_FIRST },                                    \
-  { "$11",     11 + GP_REG_FIRST },                                    \
-  { "$12",     12 + GP_REG_FIRST },                                    \
-  { "$13",     13 + GP_REG_FIRST },                                    \
-  { "$14",     14 + GP_REG_FIRST },                                    \
-  { "$15",     15 + GP_REG_FIRST },                                    \
-  { "$16",     16 + GP_REG_FIRST },                                    \
-  { "$17",     17 + GP_REG_FIRST },                                    \
-  { "$18",     18 + GP_REG_FIRST },                                    \
-  { "$19",     19 + GP_REG_FIRST },                                    \
-  { "$20",     20 + GP_REG_FIRST },                                    \
-  { "$21",     21 + GP_REG_FIRST },                                    \
-  { "$22",     22 + GP_REG_FIRST },                                    \
-  { "$23",     23 + GP_REG_FIRST },                                    \
-  { "$24",     24 + GP_REG_FIRST },                                    \
-  { "$25",     25 + GP_REG_FIRST },                                    \
-  { "$26",     26 + GP_REG_FIRST },                                    \
-  { "$27",     27 + GP_REG_FIRST },                                    \
-  { "$28",     28 + GP_REG_FIRST },                                    \
   { "$29",     29 + GP_REG_FIRST },                                    \
   { "$30",     30 + GP_REG_FIRST },                                    \
-  { "$31",     31 + GP_REG_FIRST },                                    \
-  { "$sp",     29 + GP_REG_FIRST },                                    \
-  { "$fp",     30 + GP_REG_FIRST },                                    \
   { "at",       1 + GP_REG_FIRST },                                    \
   { "v0",       2 + GP_REG_FIRST },                                    \
   { "v1",       3 + GP_REG_FIRST },                                    \
@@ -3104,8 +2841,6 @@ typedef struct mips_args {
   { "sp",      29 + GP_REG_FIRST },                                    \
   { "fp",      30 + GP_REG_FIRST },                                    \
   { "ra",      31 + GP_REG_FIRST },                                    \
-  { "$sp",     29 + GP_REG_FIRST },                                    \
-  { "$fp",     30 + GP_REG_FIRST }                                     \
   ALL_COP_ADDITIONAL_REGISTER_NAMES                                    \
 }
 
@@ -3235,35 +2970,15 @@ while (0)
 
 /* This says how to define a global common symbol.  */
 
-#define ASM_OUTPUT_ALIGNED_DECL_COMMON(STREAM, DECL, NAME, SIZE, ALIGN) \
-  do {                                                                 \
-    /* If the target wants uninitialized const declarations in         \
-       .rdata then don't put them in .comm */                          \
-    if (TARGET_EMBEDDED_DATA && TARGET_UNINIT_CONST_IN_RODATA          \
-       && TREE_CODE (DECL) == VAR_DECL && TREE_READONLY (DECL)         \
-       && (DECL_INITIAL (DECL) == 0                                    \
-           || DECL_INITIAL (DECL) == error_mark_node))                 \
-      {                                                                        \
-       if (TREE_PUBLIC (DECL) && DECL_NAME (DECL))                     \
-         (*targetm.asm_out.globalize_label) (STREAM, NAME);            \
-                                                                       \
-       readonly_data_section ();                                       \
-       ASM_OUTPUT_ALIGN (STREAM, floor_log2 (ALIGN / BITS_PER_UNIT));  \
-       mips_declare_object (STREAM, NAME, "", ":\n\t.space\t%u\n",     \
-           (SIZE));                                                    \
-      }                                                                        \
-    else                                                               \
-       mips_declare_object (STREAM, NAME, "\n\t.comm\t", ",%u\n",      \
-         (SIZE));                                                      \
-  } while (0)
-
+#define ASM_OUTPUT_ALIGNED_DECL_COMMON mips_output_aligned_decl_common
 
 /* This says how to define a local common symbol (ie, not visible to
    linker).  */
 
-#define ASM_OUTPUT_LOCAL(STREAM, NAME, SIZE, ROUNDED)                  \
-  mips_declare_object (STREAM, NAME, "\n\t.lcomm\t", ",%u\n", (int)(SIZE))
-
+#ifndef ASM_OUTPUT_ALIGNED_LOCAL
+#define ASM_OUTPUT_ALIGNED_LOCAL(STREAM, NAME, SIZE, ALIGN) \
+  mips_declare_common_object (STREAM, NAME, "\n\t.lcomm\t", SIZE, ALIGN, false)
+#endif
 
 /* This says how to output an external.  It would be possible not to
    output anything and let undefined symbol become external. However
@@ -3273,7 +2988,6 @@ while (0)
 #define ASM_OUTPUT_EXTERNAL(STREAM,DECL,NAME) \
   mips_output_external(STREAM,DECL,NAME)
 
-
 /* This is how to declare a function name.  The actual work of
    emitting the label is moved to function_prologue, so that we can
    get the line number correctly emitted before the .ent directive,
@@ -3283,6 +2997,10 @@ while (0)
 #undef ASM_DECLARE_FUNCTION_NAME
 #define ASM_DECLARE_FUNCTION_NAME(STREAM,NAME,DECL)
 
+#ifndef FUNCTION_NAME_ALREADY_DECLARED
+#define FUNCTION_NAME_ALREADY_DECLARED 0
+#endif
+
 /* This is how to store into the string LABEL
    the symbol_ref name of an internal numbered label where
    PREFIX is the class of label and NUM is the number within the class.
@@ -3300,19 +3018,15 @@ while (0)
           LOCAL_LABEL_PREFIX,                                          \
           VALUE)
 
-/* This is how to output an element of a case-vector that is relative.
-   This is used for pc-relative code (e.g. when TARGET_ABICALLS or
-   TARGET_EMBEDDED_PIC).  */
+/* This is how to output an element of a case-vector.  We can make the
+   entries PC-relative in MIPS16 code and GP-relative when .gp(d)word
+   is supported.  */
 
 #define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)             \
 do {                                                                   \
   if (TARGET_MIPS16)                                                   \
     fprintf (STREAM, "\t.half\t%sL%d-%sL%d\n",                         \
             LOCAL_LABEL_PREFIX, VALUE, LOCAL_LABEL_PREFIX, REL);       \
-  else if (TARGET_EMBEDDED_PIC)                                                \
-    fprintf (STREAM, "\t%s\t%sL%d-%sLS%d\n",                           \
-            ptr_mode == DImode ? ".dword" : ".word",                   \
-            LOCAL_LABEL_PREFIX, VALUE, LOCAL_LABEL_PREFIX, REL);       \
   else if (TARGET_GPWORD)                                              \
     fprintf (STREAM, "\t%s\t%sL%d\n",                                  \
             ptr_mode == DImode ? ".gpdword" : ".gpword",               \
@@ -3323,16 +3037,15 @@ do {                                                                    \
             LOCAL_LABEL_PREFIX, VALUE);                                \
 } while (0)
 
-/* When generating embedded PIC or mips16 code we want to put the jump
-   table in the .text section.  In all other cases, we want to put the
-   jump table in the .rdata section.  Unfortunately, we can't use
-   JUMP_TABLES_IN_TEXT_SECTION, because it is not conditional.
-   Instead, we use ASM_OUTPUT_CASE_LABEL to switch back to the .text
-   section if appropriate.  */
+/* When generating mips16 code we want to put the jump table in the .text
+   section.  In all other cases, we want to put the jump table in the .rdata
+   section.  Unfortunately, we can't use JUMP_TABLES_IN_TEXT_SECTION, because
+   it is not conditional.  Instead, we use ASM_OUTPUT_CASE_LABEL to switch back
+   to the .text section if appropriate.  */
 #undef ASM_OUTPUT_CASE_LABEL
 #define ASM_OUTPUT_CASE_LABEL(FILE, PREFIX, NUM, INSN)                 \
 do {                                                                   \
-  if (TARGET_EMBEDDED_PIC || TARGET_MIPS16)                            \
+  if (TARGET_MIPS16)                                                   \
     function_section (current_function_decl);                          \
   (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);               \
 } while (0)
@@ -3354,7 +3067,7 @@ do {                                                                      \
 /* This is how to output a string.  */
 #undef ASM_OUTPUT_ASCII
 #define ASM_OUTPUT_ASCII(STREAM, STRING, LEN)                          \
-  mips_output_ascii (STREAM, STRING, LEN)
+  mips_output_ascii (STREAM, STRING, LEN, "\t.ascii\t")
 
 /* Output #ident as a in the read-only data section.  */
 #undef  ASM_OUTPUT_IDENT
@@ -3435,28 +3148,15 @@ while (0)
 /* See mips_expand_prologue's use of loadgp for when this should be
    true.  */
 
-#define DONT_ACCESS_GBLS_AFTER_EPILOGUE (TARGET_ABICALLS               \
-                                        && mips_abi != ABI_32          \
-                                        && mips_abi != ABI_O64)
+#define DONT_ACCESS_GBLS_AFTER_EPILOGUE (TARGET_ABICALLS && !TARGET_OLDABI)
 \f
-
-#define DFMODE_NAN \
-       unsigned short DFbignan[4] = {0x7ff7, 0xffff, 0xffff, 0xffff}; \
-       unsigned short DFlittlenan[4] = {0xffff, 0xffff, 0xffff, 0xfff7}
-#define SFMODE_NAN \
-       unsigned short SFbignan[2] = {0x7fbf, 0xffff}; \
-       unsigned short SFlittlenan[2] = {0xffff, 0xffbf}
-
-/* Generate calls to memcpy, etc., not bcopy, etc.  */
-#define TARGET_MEM_FUNCTIONS
-
 #ifndef __mips16
 /* Since the bits of the _init and _fini function is spread across
    many object files, each potentially with its own GP, we must assume
    we need to load our GP.  We don't preserve $gp or $ra, since each
    init/fini chunk is supposed to initialize $gp, and crti/crtn
    already take care of preserving $ra and, when appropriate, $gp.  */
-#if _MIPS_SIM == _MIPS_SIM_ABI32
+#if (defined _ABIO32 && _MIPS_SIM == _ABIO32)
 #define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)     \
    asm (SECTION_OP "\n\
        .set noreorder\n\