Index: testsuite/gcc.target/mips/mips.exp
===================================================================
--- testsuite/gcc.target/mips/mips.exp	(revision 182183)
+++ testsuite/gcc.target/mips/mips.exp	(working copy)
@@ -226,7 +226,7 @@ set mips_option_groups {
     abi "-mabi=.*"
     addressing "addressing=.*"
     arch "-mips([1-5]|32.*|64.*)|-march=.*|isa(|_rev)(=|<=|>=).*"
-    debug "-g*"
+    debug "-g.*"
     dump_pattern "-dp"
     endianness "-E(L|B)|-me(l|b)"
     float "-m(hard|soft)-float"
@@ -241,6 +241,7 @@ set mips_option_groups {
     profiling "-pg"
     small-data "-G[0-9]+"
     warnings "-w"
+    dump "-fdump-.*"
 }
 
 # Add -mfoo/-mno-foo options to mips_option_groups.
Index: testsuite/gcc.target/mips/octeon2-pipe-1.c
===================================================================
--- testsuite/gcc.target/mips/octeon2-pipe-1.c	(revision 0)
+++ testsuite/gcc.target/mips/octeon2-pipe-1.c	(revision 0)
@@ -0,0 +1,11 @@
+/* Check that we use the octeon2 pipeline description.  */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-rtl-sched2 -march=octeon2" } */
+
+NOMIPS16 int f (int a, int b)
+{
+  return a / b;
+}
+
+/* { dg-final { scan-rtl-dump "octeon_mult\\*17" "sched2" } }  */
+/* { dg-final { cleanup-tree-dump "sched2" } }  */
Index: testsuite/gcc.target/mips/octeon-pipe-1.c
===================================================================
--- testsuite/gcc.target/mips/octeon-pipe-1.c	(revision 0)
+++ testsuite/gcc.target/mips/octeon-pipe-1.c	(revision 0)
@@ -0,0 +1,11 @@
+/* Check that we use the octeon pipeline description.  */
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=octeon -fdump-rtl-sched2" } */
+
+NOMIPS16 int f (int a, int b)
+{
+  return a / b;
+}
+
+/* { dg-final { scan-rtl-dump "octeon_mult\\*71" "sched2" } }  */
+/* { dg-final { cleanup-tree-dump "sched2" } }  */
Index: config/mips/mips-tables.opt
===================================================================
--- config/mips/mips-tables.opt	(revision 182183)
+++ config/mips/mips-tables.opt	(working copy)
@@ -606,3 +606,6 @@ Enum(mips_arch_opt_value) String(octeon)
 EnumValue
 Enum(mips_arch_opt_value) String(octeon+) Value(81) Canonical
 
+EnumValue
+Enum(mips_arch_opt_value) String(octeon2) Value(82) Canonical
+
Index: config/mips/driver-native.c
===================================================================
--- config/mips/driver-native.c	(revision 182183)
+++ config/mips/driver-native.c	(working copy)
@@ -125,6 +125,8 @@ host_detect_local_cpu (int argc, const c
 	  cpu = "sb1";
 	else if (strstr (buf, "R5000") != NULL)
 	  cpu = "r5000";
+	else if (strstr (buf, "Octeon II") != NULL)
+	  cpu = "octeon2";
 	else if (strstr (buf, "Octeon") != NULL)
 	  cpu = "octeon";
 	break;
Index: config/mips/octeon.md
===================================================================
--- config/mips/octeon.md	(revision 182183)
+++ config/mips/octeon.md	(working copy)
@@ -30,59 +30,108 @@ (define_cpu_unit "octeon_pipe1" "octeon_
 (define_cpu_unit "octeon_mult" "octeon_mult")
 
 (define_insn_reservation "octeon_arith" 1
-  (and (eq_attr "cpu" "octeon")
+  (and (eq_attr "cpu" "octeon,octeon2")
        (eq_attr "type" "arith,const,logical,move,shift,signext,slt,nop"))
   "octeon_pipe0 | octeon_pipe1")
 
 (define_insn_reservation "octeon_condmove" 2
-  (and (eq_attr "cpu" "octeon")
+  (and (eq_attr "cpu" "octeon,octeon2")
        (eq_attr "type" "condmove"))
   "octeon_pipe0 | octeon_pipe1")
 
-(define_insn_reservation "octeon_load" 2
+(define_insn_reservation "octeon_load_o1" 2
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "load,prefetch,mtc,mfc"))
   "octeon_pipe0")
 
+(define_insn_reservation "octeon_load_o2" 3
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "load,prefetch"))
+  "octeon_pipe0")
+
+;; ??? memory-related cop0 reads are pipe0 with 3-cycle latency.
+;; Front-end-related ones are 1-cycle on pipe1.  Assume front-end for now.
+(define_insn_reservation "octeon_cop_o2" 1
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "mtc,mfc"))
+  "octeon_pipe1")
+
 (define_insn_reservation "octeon_store" 1
-  (and (eq_attr "cpu" "octeon")
+  (and (eq_attr "cpu" "octeon,octeon2")
        (eq_attr "type" "store"))
   "octeon_pipe0")
 
-(define_insn_reservation "octeon_brj" 1
+(define_insn_reservation "octeon_brj_o1" 1
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "branch,jump,call,trap"))
   "octeon_pipe0")
 
-(define_insn_reservation "octeon_imul3" 5
+(define_insn_reservation "octeon_brj_o2" 2
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "branch,jump,call,trap"))
+  "octeon_pipe1")
+
+(define_insn_reservation "octeon_imul3_o1" 5
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "imul3,pop,clz"))
   "(octeon_pipe0 | octeon_pipe1) + octeon_mult")
 
-(define_insn_reservation "octeon_imul" 2
+(define_insn_reservation "octeon_imul3_o2" 6
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "imul3,pop,clz"))
+  "octeon_pipe1 + octeon_mult")
+
+(define_insn_reservation "octeon_imul_o1" 2
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "imul,mthilo"))
   "(octeon_pipe0 | octeon_pipe1) + octeon_mult, octeon_mult")
 
-(define_insn_reservation "octeon_mfhilo" 5
+(define_insn_reservation "octeon_imul_o2" 1
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "imul,mthilo"))
+  "octeon_pipe1 + octeon_mult")
+
+(define_insn_reservation "octeon_mfhilo_o1" 5
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "mfhilo"))
   "(octeon_pipe0 | octeon_pipe1) + octeon_mult")
 
-(define_insn_reservation "octeon_imadd" 4
+(define_insn_reservation "octeon_mfhilo_o2" 6
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "mfhilo"))
+  "octeon_pipe1 + octeon_mult")
+
+(define_insn_reservation "octeon_imadd_o1" 4
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "imadd"))
   "(octeon_pipe0 | octeon_pipe1) + octeon_mult, octeon_mult*3")
 
-(define_insn_reservation "octeon_idiv" 72
+(define_insn_reservation "octeon_imadd_o2" 1
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "type" "imadd"))
+  "octeon_pipe1 + octeon_mult")
+
+(define_insn_reservation "octeon_idiv_o1" 72
   (and (eq_attr "cpu" "octeon")
        (eq_attr "type" "idiv"))
   "(octeon_pipe0 | octeon_pipe1) + octeon_mult, octeon_mult*71")
 
+(define_insn_reservation "octeon_idiv_o2_si" 18
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "mode" "SI")
+       (eq_attr "type" "idiv"))
+  "octeon_pipe1 + octeon_mult, octeon_mult*17")
+
+(define_insn_reservation "octeon_idiv_o2_di" 35
+  (and (eq_attr "cpu" "octeon2")
+       (eq_attr "mode" "DI")
+       (eq_attr "type" "idiv"))
+  "octeon_pipe1 + octeon_mult, octeon_mult*34")
+
 ;; Assume both pipes are needed for unknown and multiple-instruction
 ;; patterns.
 
 (define_insn_reservation "octeon_unknown" 1
-  (and (eq_attr "cpu" "octeon")
+  (and (eq_attr "cpu" "octeon,octeon2")
        (eq_attr "type" "unknown,multi"))
   "octeon_pipe0 + octeon_pipe1")
Index: config/mips/mips.md
===================================================================
--- config/mips/mips.md	(revision 182183)
+++ config/mips/mips.md	(working copy)
@@ -42,6 +42,7 @@ (define_enum "processor" [
   loongson_3a
   m4k
   octeon
+  octeon2
   r3900
   r6000
   r4000
Index: config/mips/mips-cpus.def
===================================================================
--- config/mips/mips-cpus.def	(revision 182183)
+++ config/mips/mips-cpus.def	(working copy)
@@ -146,3 +146,4 @@ MIPS_CPU ("loongson3a", PROCESSOR_LOONGS
 /* MIPS64 Release 2 processors.  */
 MIPS_CPU ("octeon", PROCESSOR_OCTEON, 65, PTF_AVOID_BRANCHLIKELY)
 MIPS_CPU ("octeon+", PROCESSOR_OCTEON, 65, PTF_AVOID_BRANCHLIKELY)
+MIPS_CPU ("octeon2", PROCESSOR_OCTEON2, 65, PTF_AVOID_BRANCHLIKELY)
Index: config/mips/mips.c
===================================================================
--- config/mips/mips.c	(revision 182183)
+++ config/mips/mips.c	(working copy)
@@ -880,6 +880,16 @@ static const struct mips_rtx_cost_data
                      1,		  /* branch_cost */
                      4		  /* memory_latency */
   },
+    /* Octeon II */
+  {
+    SOFT_FP_COSTS,
+    COSTS_N_INSNS (6),            /* int_mult_si */
+    COSTS_N_INSNS (6),            /* int_mult_di */
+    COSTS_N_INSNS (18),           /* int_div_si */
+    COSTS_N_INSNS (35),           /* int_div_di */
+                     4,		  /* branch_cost */
+                     4		  /* memory_latency */
+  },
   { /* R3900 */
     COSTS_N_INSNS (2),            /* fp_add */
     COSTS_N_INSNS (4),            /* fp_mult_sf */
@@ -12038,6 +12048,7 @@ mips_issue_rate (void)
     case PROCESSOR_R7000:
     case PROCESSOR_R9000:
     case PROCESSOR_OCTEON:
+    case PROCESSOR_OCTEON2:
       return 2;
 
     case PROCESSOR_SB1:
Index: config/mips/mips.h
===================================================================
--- config/mips/mips.h	(revision 182183)
+++ config/mips/mips.h	(working copy)
@@ -222,7 +222,9 @@ struct mips_cpu_info {
 #define TARGET_MIPS5500             (mips_arch == PROCESSOR_R5500)
 #define TARGET_MIPS7000             (mips_arch == PROCESSOR_R7000)
 #define TARGET_MIPS9000             (mips_arch == PROCESSOR_R9000)
-#define TARGET_OCTEON		    (mips_arch == PROCESSOR_OCTEON)
+#define TARGET_OCTEON		    (mips_arch == PROCESSOR_OCTEON	\
+				     || mips_arch == PROCESSOR_OCTEON2)
+#define TARGET_OCTEON2		    (mips_arch == PROCESSOR_OCTEON2)
 #define TARGET_SB1                  (mips_arch == PROCESSOR_SB1		\
 				     || mips_arch == PROCESSOR_SB1A)
 #define TARGET_SR71K                (mips_arch == PROCESSOR_SR71000)
@@ -250,7 +252,8 @@ struct mips_cpu_info {
 #define TUNE_MIPS6000               (mips_tune == PROCESSOR_R6000)
 #define TUNE_MIPS7000               (mips_tune == PROCESSOR_R7000)
 #define TUNE_MIPS9000               (mips_tune == PROCESSOR_R9000)
-#define TUNE_OCTEON		    (mips_tune == PROCESSOR_OCTEON)
+#define TUNE_OCTEON		    (mips_tune == PROCESSOR_OCTEON	\
+				     || mips_tune == PROCESSOR_OCTEON2)
 #define TUNE_SB1                    (mips_tune == PROCESSOR_SB1		\
 				     || mips_tune == PROCESSOR_SB1A)
 
