--- a/gcc/ira-conflicts.c	Sun Feb 07 18:28:00 2010 +0900
+++ b/gcc/ira-conflicts.c	Fri Feb 12 23:39:51 2010 +0900
@@ -152,7 +152,7 @@
 		}
 	    }
 	}
-	  
+
       for (r = ira_finish_point_ranges[i]; r != NULL; r = r->finish_next)
 	sparseset_clear_bit (allocnos_live, ALLOCNO_NUM (r->allocno));
     }
@@ -235,7 +235,7 @@
 	  {
 	  case 'X':
 	    return -1;
-	    
+
 	  case 'm':
 	  case 'o':
 	    /* Accept a register which might be placed in memory.  */
@@ -248,15 +248,13 @@
 	    break;
 
 	  case 'p':
-	    GO_IF_LEGITIMATE_ADDRESS (VOIDmode, op, win_p);
+	    if (address_operand (op, VOIDmode))
+	      return -1;
 	    break;
-	    
-	  win_p:
-	    return -1;
-	  
+
 	  case 'g':
 	    return -1;
-	    
+
 	  case 'r':
 	  case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
 	  case 'h': case 'j': case 'k': case 'l':
@@ -278,7 +276,7 @@
 #endif
 	      break;
 	    }
-	    
+
 	  case '0': case '1': case '2': case '3': case '4':
 	  case '5': case '6': case '7': case '8': case '9':
 	    if (original != -1 && original != c)
@@ -391,7 +389,7 @@
 				 ira_curr_regno_allocno_map[REGNO (reg2)],
 				 freq, constraint_p, insn,
 				 ira_curr_loop_tree_node);
-      bitmap_set_bit (ira_curr_loop_tree_node->local_copies, cp->num); 
+      bitmap_set_bit (ira_curr_loop_tree_node->local_copies, cp->num);
       return true;
     }
   else
@@ -448,11 +446,11 @@
   for (i = 0; i < recog_data.n_operands; i++)
     {
       another_reg = recog_data.operand[i];
-      
+
       if (!REG_SUBREG_P (another_reg) || op_num == i
 	  || recog_data.operand_type[i] != OP_OUT)
 	continue;
-      
+
       process_regs_for_copy (reg, another_reg, false, NULL_RTX, freq);
     }
 }
@@ -467,7 +465,7 @@
   const char *str;
   bool commut_p, bound_p;
   int i, j, freq;
-  
+
   freq = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (insn));
   if (freq == 0)
     freq = 1;
@@ -491,7 +489,7 @@
 				? operand : SUBREG_REG (operand)) != NULL_RTX)
 	    {
 	      str = recog_data.constraints[i];
-	      while (*str == ' ' && *str == '\t')
+	      while (*str == ' ' || *str == '\t')
 		str++;
 	      bound_p = false;
 	      for (j = 0, commut_p = false; j < 2; j++, commut_p = true)
@@ -524,7 +522,7 @@
   if (bb == NULL)
     return;
   FOR_BB_INSNS (bb, insn)
-    if (INSN_P (insn))
+    if (NONDEBUG_INSN_P (insn))
       add_insn_allocno_copies (insn);
 }
 
@@ -664,7 +662,7 @@
 {
   int i, start;
 
-  fprintf (file, title);
+  fputs (title, file);
   for (start = -1, i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     {
       if (TEST_HARD_REG_BIT (set, i))
@@ -684,7 +682,7 @@
 	  start = -1;
 	}
     }
-  fprintf (file, "\n");
+  putc ('\n', file);
 }
 
 /* Print information about allocno or only regno (if REG_P) conflicts
@@ -711,9 +709,9 @@
 	    fprintf (file, "b%d", bb->index);
 	  else
 	    fprintf (file, "l%d", ALLOCNO_LOOP_TREE_NODE (a)->loop->num);
-	  fprintf (file, ")");
+	  putc (')', file);
 	}
-      fprintf (file, " conflicts:");
+      fputs (" conflicts:", file);
       if (ALLOCNO_CONFLICT_ALLOCNO_ARRAY (a) != NULL)
 	FOR_EACH_ALLOCNO_CONFLICT (a, conflict_a, aci)
 	  {
@@ -745,7 +743,7 @@
       print_hard_reg_set (file, ";;     conflict hard regs:",
 			  conflicting_hard_regs);
     }
-  fprintf (file, "\n");
+  putc ('\n', file);
 }
 
 /* Print information about allocno or only regno (if REG_P) conflicts