mips.c (mips_cpu): Moved into ...

2001-07-21  H.J. Lu  (hjl@gnu.org)

	* config/mips/mips.c (mips_cpu): Moved into ...
	(override_options): Here.

	* config/mips/mips.h (mips_cpu_attr): Replace mips_cpu with
	mips_tune.
	(mips_cpu): Removed.

From-SVN: r44231

gcc/ChangeLog

+2001-07-21  H.J. Lu  (hjl@gnu.org)
+
+	* config/mips/mips.c (mips_cpu): Moved into ...
+	(override_options): Here.
+
+	* config/mips/mips.h (mips_cpu_attr): Replace mips_cpu with
+	mips_tune.
+	(mips_cpu): Removed.
+
 2001-07-21  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* config/m68hc11/m68hc11.md ("andqi3"): Accept d as second operand.

gcc/config/mips/mips.c

@@ -202,9 +202,6 @@ enum processor_type mips_arch;
 /* The target cpu for optimization and scheduling.  */
 enum processor_type mips_tune;
 
-/* Historical option for code generation and scheduling.  */
-enum processor_type mips_cpu;
-
 /* which instruction set architecture to use.  */
 int mips_isa;
 
@@ -4706,6 +4703,7 @@ override_options ()
   register int i, start;
   register int regno;
   register enum machine_mode mode;
+  register enum processor_type mips_cpu;
 
   mips_section_threshold = g_switch_set ? g_switch_value : MIPS_DEFAULT_GVALUE;
 

gcc/config/mips/mips.h

@@ -71,7 +71,7 @@ enum processor_type {
 };
 
 /* Recast the cpu class to be the cpu attribute.  */
-#define mips_cpu_attr ((enum attr_cpu)mips_cpu)
+#define mips_cpu_attr ((enum attr_cpu)mips_tune)
 
 /* Which ABI to use.  These are constants because abi64.h must check their
    value at preprocessing time.
@@ -135,7 +135,6 @@ extern struct rtx_def *branch_cmp[2];	/* operands for compare */
 extern enum cmp_type branch_type;	/* what type of branch to use */
 extern enum processor_type mips_arch;   /* which cpu to codegen for */
 extern enum processor_type mips_tune;   /* which cpu to schedule for */
-extern enum processor_type mips_cpu;	/* historical codegen/sched */
 extern enum mips_abicalls_type mips_abicalls;/* for svr4 abi pic calls */
 extern int mips_isa;			/* architectural level */
 extern int mips16;			/* whether generating mips16 code */