3 files changed, 27 insertions, 23 deletions
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 8186f5fa7e8..2270c62a8bc 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "expr.h"
 #include "recog.h"
+#include "toplev.h"
 
 /* 1 if the caller has placed an "unimp" insn immediately after the call.
    This is used in v8 code when calling a function that returns a structure.
@@ -400,7 +401,7 @@ fp_zero_operand (op)
 int
 intreg_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   return (register_operand (op, SImode)
 	  || (TARGET_ARCH64 && register_operand (op, DImode)));
@@ -520,7 +521,7 @@ symbolic_operand (op, mode)
 int
 symbolic_memory_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   if (GET_CODE (op) == SUBREG)
     op = SUBREG_REG (op);
@@ -551,7 +552,7 @@ label_ref_operand (op, mode)
 int
 sp64_medium_pic_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   /* Check for (const (minus (symbol_ref:GOT)
                              (const (minus (label) (pc))))).  */
@@ -578,7 +579,7 @@ sp64_medium_pic_operand (op, mode)
 int
 data_segment_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   switch (GET_CODE (op))
     {
@@ -600,7 +601,7 @@ data_segment_operand (op, mode)
 int
 text_segment_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   switch (GET_CODE (op))
     {
@@ -686,7 +687,7 @@ move_operand (op, mode)
 int
 splittable_symbolic_memory_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   if (GET_CODE (op) != MEM)
     return 0;
@@ -698,7 +699,7 @@ splittable_symbolic_memory_operand (op, mode)
 int
 splittable_immediate_memory_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   if (GET_CODE (op) != MEM)
     return 0;
@@ -712,7 +713,7 @@ splittable_immediate_memory_operand (op, mode)
 int
 eq_or_neq (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   return (GET_CODE (op) == EQ || GET_CODE (op) == NE);
 }
@@ -723,7 +724,7 @@ eq_or_neq (op, mode)
 int
 normal_comp_operator (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   enum rtx_code code = GET_CODE (op);
 
@@ -743,7 +744,7 @@ normal_comp_operator (op, mode)
 int
 noov_compare_op (op, mode)
     register rtx op;
-    enum machine_mode mode;
+    enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   enum rtx_code code = GET_CODE (op);
 
@@ -762,7 +763,7 @@ noov_compare_op (op, mode)
 int
 v9_regcmp_op (op, mode)
      register rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   enum rtx_code code = GET_CODE (op);
 
@@ -775,7 +776,7 @@ v9_regcmp_op (op, mode)
 int
 v8plus_regcmp_op (op, mode)
      register rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   enum rtx_code code = GET_CODE (op);
 
@@ -787,7 +788,7 @@ v8plus_regcmp_op (op, mode)
 int
 extend_op (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   return GET_CODE (op) == SIGN_EXTEND || GET_CODE (op) == ZERO_EXTEND;
 }
@@ -799,7 +800,7 @@ extend_op (op, mode)
 int
 cc_arithop (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   if (GET_CODE (op) == AND
       || GET_CODE (op) == IOR
@@ -815,7 +816,7 @@ cc_arithop (op, mode)
 int
 cc_arithopn (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   /* XOR is not here because combine canonicalizes (xor (not ...) ...)
      and (xor ... (not ...)) to (not (xor ...)).   */
@@ -947,7 +948,7 @@ arith10_double_operand (op, mode)
 int
 small_int (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   return (GET_CODE (op) == CONST_INT && SMALL_INT (op));
 }
@@ -959,7 +960,7 @@ small_int (op, mode)
 int
 uns_small_int (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
 #if HOST_BITS_PER_WIDE_INT > 32
   /* All allowed constants will fit a CONST_INT.  */
@@ -986,7 +987,7 @@ uns_arith_operand (op, mode)
 int
 clobbered_register (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   return (GET_CODE (op) == REG && call_used_regs[REGNO (op)]);
 }
@@ -1433,7 +1434,7 @@ pic_address_needs_scratch (x)
 rtx
 legitimize_pic_address (orig, mode, reg)
      rtx orig;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
      rtx reg;
 {
   if (GET_CODE (orig) == SYMBOL_REF)
@@ -4669,9 +4670,6 @@ sparc_builtin_saveregs (arglist)
      tree arglist;
 {
   tree fntype = TREE_TYPE (current_function_decl);
-  int stdarg = (TYPE_ARG_TYPES (fntype) != 0
-		&& (TREE_VALUE (tree_last (TYPE_ARG_TYPES (fntype)))
-		    != void_type_node));
   int first_reg = current_function_args_info.words;
   rtx address;
   int regno;
@@ -6801,7 +6799,7 @@ sparc_return_peephole_ok (dest, src)
 int
 delay_operand (op, mode)
      rtx op;
-     enum machine_mode mode;
+     enum machine_mode mode ATTRIBUTE_UNUSED;
 {
   switch (GET_CODE (op))
     {
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index fea8e9205f1..2add5214ec9 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -3207,6 +3207,7 @@ extern char *singlemove_string ();
 
 extern void emit_v9_brxx_insn ();
 extern void finalize_pic ();
+extern void order_regs_for_local_alloc ();
 extern void output_double_int ();
 extern void output_function_epilogue ();
 extern void output_function_prologue ();
@@ -3228,6 +3229,7 @@ extern int check_pic ();
 extern int compute_frame_size ();
 extern int data_segment_operand ();
 extern int eligible_for_epilogue_delay ();
+extern int eligible_for_return_delay ();
 extern int emit_move_sequence ();
 extern int extend_op ();
 extern int fcc_reg_operand ();
@@ -3249,6 +3251,7 @@ extern int small_int ();
 extern int sp64_medium_pic_operand ();
 extern int sparc_flat_eligible_for_epilogue_delay ();
 extern int sparc_flat_epilogue_delay_slots ();
+extern int sparc_issue_rate ();
 extern int sparc_operand ();
 extern int splittable_immediate_memory_operand ();
 extern int splittable_symbolic_memory_operand ();
@@ -3258,6 +3261,7 @@ extern int symbolic_operand ();
 extern int text_segment_operand ();
 extern int ultrasparc_adjust_cost ();
 extern int uns_small_int ();
+extern int v8plus_regcmp_p ();
 extern int v9_regcmp_op ();
 extern int v9_regcmp_p ();
 
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index 64cc6bcac9e..683bcfd55f8 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -567,6 +567,8 @@
       if (sparc_check_64 (operands[1], insn) <= 0)
 	output_asm_insn (\"srl %L1,0,%L1\", operands);
       return \"sllx %H1,32,%3\;or %L0,%2,%2\;or %L1,%3,%3\;cmp %2,%3\";
+    default:
+      abort();
     }
 }"
   [(set_attr "length" "3,4,7")])