diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91293c1dfbb..ea6d17b2b23 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-23  Roger Sayle  <roger@eyesopen.com>
+
+	PR target/21283
+	* config/fr30/fr30.md (define_split): Avoid calling gen_lowpart on
+	a SImode SUBREG of a floating point register after no_new_pseudos.
+
 2006-04-23  Roger Sayle  <roger@eyesopen.com>
 
 	* config/fr30/fr30.md (addsi_small_int): Use REGNO_PTR_FRAME_P to
diff --git a/gcc/config/fr30/fr30.md b/gcc/config/fr30/fr30.md
index 0398eccc005..0deda961e85 100644
--- a/gcc/config/fr30/fr30.md
+++ b/gcc/config/fr30/fr30.md
@@ -290,7 +290,9 @@
 (define_split
   [(set (match_operand:SI 0 "register_operand"  "")
 	(match_operand:SI 1 "const_int_operand" ""))]
-   "INTVAL (operands[1]) <= -1 && INTVAL (operands[1]) >= -128"
+   "INTVAL (operands[1]) <= -1 && INTVAL (operands[1]) >= -128
+    && (GET_CODE (operands[0]) != SUBREG
+	|| SCALAR_INT_MODE_P (GET_MODE (XEXP (operands[0], 0))))"
    [(set:SI (match_dup 0) (match_dup 1))
     (set:SI (match_dup 0) (sign_extend:SI (match_dup 2)))]
    "{