Move setting -mgpopt from CC1_SPEC to OPTIMIZATION_OPTIONS.

From-SVN: r4263

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index a688e20..74649d7 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -482,8 +482,9 @@ while (0)
 {                                                                      \
   if (LEVEL)                                                           \
     {                                                                  \
-      flag_omit_frame_pointer          = TRUE;                         \
-      flag_schedule_insns_after_reload = TRUE;                         \
+      flag_omit_frame_pointer         = TRUE;                          \
+      flag_schedule_insns_after_reload = TRUE;                         \
+      target_flags &= MASK_GPOPT;                                      \
     }                                                                  \
 }
 \f
@@ -609,7 +610,6 @@ while (0)
 
 #ifndef CC1_SPEC
 #define CC1_SPEC "\
-%{O*: %{!mno-gpOPT:%{!mno-gpopt: -mgpopt}}} \
 %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
 %{G*} \
 %{pic-none:   -mno-half-pic} \
@@ -645,7 +645,7 @@ while (0)
 \f
 /* Print subsidiary information on the compiler version in use.  */
 
-#define MIPS_VERSION "[AL 1.1, MM 39]"
+#define MIPS_VERSION "[AL 1.1, MM 40]"
 
 #ifndef MACHINE_TYPE
 #define MACHINE_TYPE "BSD Mips"