tm.texi.in (PREFERRED_OUTPUT_RELOAD_CLASS): Remove.

	* doc/tm.texi.in (PREFERRED_OUTPUT_RELOAD_CLASS): Remove.
	* doc/tm.texi: Regenerate.
	* targhooks.c (default_preferred_output_reload_class): Don't use
	PREFERRED_OUTPUT_RELOAD_CLASS macro.
	* system.h (PREFERRED_OUTPUT_RELOAD_CLASS): Poison.

From-SVN: r177926

5 files changed, 10 insertions, 23 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a365e7..987baa9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-20  Anatoly Sokolov  <aesok@post.ru>
+
+	* doc/tm.texi.in (PREFERRED_OUTPUT_RELOAD_CLASS): Remove.
+	* doc/tm.texi: Regenerate.
+	* targhooks.c (default_preferred_output_reload_class): Don't use
+	PREFERRED_OUTPUT_RELOAD_CLASS macro.
+	* system.h (PREFERRED_OUTPUT_RELOAD_CLASS): Poison.
+
 2011-08-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/48739
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 0a2f120..7364aa1 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -2601,15 +2601,6 @@ this feature to discourage usage of 387 registers when math is done in
 the SSE registers (and vice versa).
 @end defmac
 
-@defmac PREFERRED_OUTPUT_RELOAD_CLASS (@var{x}, @var{class})
-Like @code{PREFERRED_RELOAD_CLASS}, but for output reloads instead of
-input reloads.  If you don't define this macro, the default is to use
-@var{class}, unchanged.
-
-You can also use @code{PREFERRED_OUTPUT_RELOAD_CLASS} to discourage
-reload from using some alternatives, like @code{PREFERRED_RELOAD_CLASS}.
-@end defmac
-
 @deftypefn {Target Hook} reg_class_t TARGET_PREFERRED_OUTPUT_RELOAD_CLASS (rtx @var{x}, reg_class_t @var{rclass})
 Like @code{TARGET_PREFERRED_RELOAD_CLASS}, but for output reloads instead of
 input reloads.
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index c53cbe8..4535fd6 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -2587,15 +2587,6 @@ this feature to discourage usage of 387 registers when math is done in
 the SSE registers (and vice versa).
 @end defmac
 
-@defmac PREFERRED_OUTPUT_RELOAD_CLASS (@var{x}, @var{class})
-Like @code{PREFERRED_RELOAD_CLASS}, but for output reloads instead of
-input reloads.  If you don't define this macro, the default is to use
-@var{class}, unchanged.
-
-You can also use @code{PREFERRED_OUTPUT_RELOAD_CLASS} to discourage
-reload from using some alternatives, like @code{PREFERRED_RELOAD_CLASS}.
-@end defmac
-
 @hook TARGET_PREFERRED_OUTPUT_RELOAD_CLASS
 Like @code{TARGET_PREFERRED_RELOAD_CLASS}, but for output reloads instead of
 input reloads.
diff --git a/gcc/system.h b/gcc/system.h
index 9698c61..340a560 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -866,7 +866,8 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 	USING_SVR4_H SVR4_ASM_SPEC FUNCTION_ARG FUNCTION_ARG_ADVANCE	   \
 	FUNCTION_INCOMING_ARG IRA_COVER_CLASSES TARGET_VERSION		   \
 	MACHINE_TYPE TARGET_HAS_TARGETCM ASM_OUTPUT_BSS			   \
-	SETJMP_VIA_SAVE_AREA FORBIDDEN_INC_DEC_CLASSES
+	SETJMP_VIA_SAVE_AREA FORBIDDEN_INC_DEC_CLASSES			   \
+	PREFERRED_OUTPUT_RELOAD_CLASS
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 16d0b18..8ad517f 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -1287,11 +1287,7 @@ reg_class_t
 default_preferred_output_reload_class (rtx x ATTRIBUTE_UNUSED,
 				       reg_class_t rclass)
 {
-#ifdef PREFERRED_OUTPUT_RELOAD_CLASS
-  return PREFERRED_OUTPUT_RELOAD_CLASS (x, (enum reg_class) rclass);
-#else
   return rclass;
-#endif
 }
 
 /* The default implementation of TARGET_PREFERRED_RENAME_CLASS.  */