v850.h (OUTPUT_ADDR_CONST_EXTRA): Remove.

	* config/v850/v850.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
	* config/v850/v850-protos.h (v850_output_addr_const_extra): Remove.
	* config/v850/v850.c (v850_output_addr_const_extra): Make static.
	Change return type to bool.
	(TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define.

From-SVN: r171117

4 files changed, 19 insertions, 13 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 815ab0c..8fe2386 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-17  Anatoly Sokolov  <aesok@post.ru>
+
+	* config/v850/v850.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
+	* config/v850/v850-protos.h (v850_output_addr_const_extra): Remove.
+	* config/v850/v850.c (v850_output_addr_const_extra): Make static.
+	Change return type to bool.
+	(TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define.
+
 2011-03-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/48163
diff --git a/gcc/config/v850/v850-protos.h b/gcc/config/v850/v850-protos.h
index 8ee6c20..1f8b7f1 100644
--- a/gcc/config/v850/v850-protos.h
+++ b/gcc/config/v850/v850-protos.h
@@ -1,5 +1,5 @@
 /* Prototypes for v850.c functions used in the md file & elsewhere.
-   Copyright (C) 1999, 2000, 2002, 2004, 2005, 2007, 2010
+   Copyright (C) 1999, 2000, 2002, 2004, 2005, 2007, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GCC.
@@ -33,7 +33,6 @@ extern int    compute_frame_size            (int, long *);
 extern void   v850_init_expanders           (void);
 
 #ifdef RTX_CODE
-extern int    v850_output_addr_const_extra  (FILE *, rtx);
 extern rtx    v850_return_addr              (int);
 extern const char *output_move_single       (rtx *);
 extern void   notice_update_cc              (rtx, rtx);
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 6d6ed78..4fbdceb 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -1,6 +1,6 @@
 /* Subroutines for insn-output.c for NEC V850 series
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
    Contributed by Jeff Law (law@cygnus.com).
 
    This file is part of GCC.
@@ -795,13 +795,13 @@ v850_print_operand_punct_valid_p (unsigned char code)
    the truncate and just emit the difference of the two labels.  The
    .hword directive will automatically handle the truncation for us.
    
-   Returns 1 if rtx was handled, 0 otherwise.  */
+   Returns true if rtx was handled, false otherwise.  */
 
-int
+static bool
 v850_output_addr_const_extra (FILE * file, rtx x)
 {
   if (GET_CODE (x) != TRUNCATE)
-    return 0;
+    return false;
 
   x = XEXP (x, 0);
 
@@ -814,10 +814,10 @@ v850_output_addr_const_extra (FILE * file, rtx x)
       && GET_CODE (XEXP (x, 0)) == LABEL_REF
       && GET_CODE (XEXP (XEXP (x, 0), 0)) == CODE_LABEL
       && INSN_DELETED_P (XEXP (XEXP (x, 0), 0)))
-    return 1;
+    return true;
 
   output_addr_const (file, x);
-  return 1;
+  return true;
 }
 
 /* Return appropriate code to load up a 1, 2, or 4 integer/floating
@@ -3138,6 +3138,9 @@ static const struct attribute_spec v850_attribute_table[] =
 #undef  TARGET_PRINT_OPERAND_PUNCT_VALID_P
 #define TARGET_PRINT_OPERAND_PUNCT_VALID_P v850_print_operand_punct_valid_p
 
+#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA
+#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA v850_output_addr_const_extra
+
 #undef  TARGET_ATTRIBUTE_TABLE
 #define TARGET_ATTRIBUTE_TABLE v850_attribute_table
 
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 892a34c..c21f820 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler. NEC V850 series
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
    Contributed by Jeff Law (law@cygnus.com).
 
    This file is part of GCC.
@@ -748,10 +748,6 @@ typedef enum
 #undef  USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX "_"
 
-#define OUTPUT_ADDR_CONST_EXTRA(FILE, X, FAIL)  \
-  if (! v850_output_addr_const_extra (FILE, X)) \
-     goto FAIL
-
 /* This says how to output the assembler to define a global
    uninitialized but not common symbol.  */