From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 15 Oct 2010 12:40:07 +0000 (+0100)
Subject: frv.c (frv_option_optimization, [...]): Remove.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25b0dd68f0aa19b8aa8db4c36a51e456c31c20cd;p=gcc.git

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 4bbc979d79a..eb67d491727 100644
--- 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 401aeecf65b..728c4d218fd 100644
--- 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;
 }
 
-
-/* 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
-    }
-}
-
 
 /* 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 bf433d9978e..d3d63201200 100644
--- 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.