frv.c (frv_option_optimization, [...]): Remove.

	* config/frv/frv.c (frv_option_optimization,
	TARGET_OPTION_OPTIMIZATION): Remove.
	* config/frv/frv.h (RCSP_SOFTWARE_PIPELINING): Remove.

From-SVN: r165505

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4bbc979d79a38d24f1bf78d28cdc6f522f85ae9d..eb67d4917270b1f8ff2b002a13d9ad54021808e1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-15  Joseph Myers  <joseph@codesourcery.com>
+
+       * config/frv/frv.c (frv_option_optimization,
+       TARGET_OPTION_OPTIMIZATION): Remove.
+       * config/frv/frv.h (RCSP_SOFTWARE_PIPELINING): Remove.
+
 2010-10-15  Michael Matz  <matz@suse.de>
 
        * cgraphunit.c (clone_of_p): Define unconditionally.

diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 401aeecf65bc6381617ff98fbe2e426f99a25099..728c4d218fd3c99b27e944d98e3cee58fb1e97cf 100644 (file)
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -265,7 +265,6 @@ frv_cpu_t frv_cpu_type = CPU_TYPE;  /* value of -mcpu= */
 
 static bool frv_handle_option                  (size_t, const char *, int);
 static void frv_option_override                        (void);
-static void frv_option_optimization            (int, int);
 static bool frv_legitimate_address_p           (enum machine_mode, rtx, bool);
 static int frv_default_flags_for_cpu           (void);
 static int frv_string_begins_with              (const_tree, const char *);
@@ -432,8 +431,6 @@ static bool frv_class_likely_spilled_p              (reg_class_t);
 #define TARGET_HANDLE_OPTION frv_handle_option
 #undef TARGET_OPTION_OVERRIDE
 #define TARGET_OPTION_OVERRIDE frv_option_override
-#undef TARGET_OPTION_OPTIMIZATION
-#define TARGET_OPTION_OPTIMIZATION frv_option_optimization
 #undef TARGET_INIT_BUILTINS
 #define TARGET_INIT_BUILTINS frv_init_builtins
 #undef TARGET_EXPAND_BUILTIN
@@ -846,25 +843,6 @@ frv_option_override (void)
   init_machine_status = frv_init_machine_status;
 }
 
-\f
-/* Implement TARGET_OPTION_OPTIMIZATION.
-
-   On the FRV, possibly disable VLIW packing which is done by the 2nd
-   scheduling pass at the current time.  */
-static void
-frv_option_optimization (int level, int size ATTRIBUTE_UNUSED)
-{
-  if (level >= 2)
-    {
-#ifdef DISABLE_SCHED2
-      flag_schedule_insns_after_reload = 0;
-#endif
-#ifdef ENABLE_RCSP
-      flag_rcsp = 1;
-#endif
-    }
-}
-
 \f
 /* Return true if NAME (a STRING_CST node) begins with PREFIX.  */
 

diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h
index bf433d9978eae1768b0a1c19421b27a75ff4d163..d3d63201200bbcb29656ad6f1a9fe9150a88b696 100644 (file)
--- a/gcc/config/frv/frv.h
+++ b/gcc/config/frv/frv.h
@@ -2459,11 +2459,6 @@ frv_ifcvt_modify_multiple_tests (CE_INFO, BB, &TRUE_EXPR, &FALSE_EXPR)
 #define MINIMAL_SECOND_JUMP_OPTIMIZATION
 
 
-/* If the following macro is defined and nonzero and deterministic
-   finite state automata are used for pipeline hazard recognition, the
-   code making resource-constrained software pipelining is on.  */
-#define RCSP_SOFTWARE_PIPELINING 1
-
 /* If the following macro is defined and nonzero and deterministic
    finite state automata are used for pipeline hazard recognition, we
    will try to exchange insns in queue ready to improve the schedule.