Index: gcc/postreload.c
===================================================================
--- gcc/postreload.c	(revision 162726)
+++ gcc/postreload.c	(working copy)
@@ -528,7 +528,7 @@ reload_cse_simplify_operands (rtx insn, 
 	  if (! TEST_HARD_REG_BIT (equiv_regs[i], regno))
 	    continue;
 
-	  SET_REGNO (testreg, regno);
+	  SET_REGNO_RAW (testreg, regno);
 	  PUT_MODE (testreg, mode);
 
 	  /* We found a register equal to this operand.  Now look for all
Index: gcc/caller-save.c
===================================================================
--- gcc/caller-save.c	(revision 162726)
+++ gcc/caller-save.c	(working copy)
@@ -124,7 +124,7 @@ reg_save_code (int reg, enum machine_mod
 
   /* Update the register number and modes of the register
      and memory operand.  */
-  SET_REGNO (test_reg, reg);
+  SET_REGNO_RAW (test_reg, reg);
   PUT_MODE (test_reg, mode);
   PUT_MODE (test_mem, mode);
 
Index: gcc/ira.c
===================================================================
--- gcc/ira.c	(revision 162726)
+++ gcc/ira.c	(working copy)
@@ -1219,9 +1219,9 @@ setup_prohibited_mode_move_regs (void)
 	{
 	  if (! HARD_REGNO_MODE_OK (j, (enum machine_mode) i))
 	    continue;
-	  SET_REGNO (test_reg1, j);
+	  SET_REGNO_RAW (test_reg1, j);
 	  PUT_MODE (test_reg1, (enum machine_mode) i);
-	  SET_REGNO (test_reg2, j);
+	  SET_REGNO_RAW (test_reg2, j);
 	  PUT_MODE (test_reg2, (enum machine_mode) i);
 	  INSN_CODE (move_insn) = -1;
 	  recog_memoized (move_insn);
Index: gcc/rtl.h
===================================================================
--- gcc/rtl.h	(revision 162726)
+++ gcc/rtl.h	(working copy)
@@ -1039,6 +1039,7 @@ enum label_kind
    be used on RHS.  Use SET_REGNO to change the value.  */
 #define REGNO(RTX) (rhs_regno(RTX))
 #define SET_REGNO(RTX,N) (df_ref_change_reg_with_loc (REGNO(RTX), N, RTX), XCUINT (RTX, 0, REG) = N)
+#define SET_REGNO_RAW(RTX,N) (XCUINT (RTX, 0, REG) = N)
 
 /* ORIGINAL_REGNO holds the number the register originally had; for a
    pseudo register turned into a hard reg this will hold the old pseudo