diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a6bd70888f5938ef7434e8f8f6dd67433f59b84..345f7d6bec75c4ec4e985c37f43948b0213e06b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-13  J"orn Rennecke <joern.rennecke@st.com>
+
+	* rtlhooks.c (gen_lowpart_general): Handle SUBREGs of floating point
+	values.
+
 2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* config/mt/t-mt (MULTILIB_OPTIONS): Add ms2
diff --git a/gcc/rtlhooks.c b/gcc/rtlhooks.c
index bc413987865f27a15d5eb1c36fd787da059900ae..0034da783fac85b882f5919e6d169be71cbebcaf 100644
--- a/gcc/rtlhooks.c
+++ b/gcc/rtlhooks.c
@@ -44,9 +44,12 @@ gen_lowpart_general (enum machine_mode mode, rtx x)
 
   if (result)
     return result;
-  else if (REG_P (x))
+  /* If it's a REG, it must be a hard reg that's not valid in MODE.  */
+  else if (REG_P (x)
+	   /* Or we could have a subreg of a floating point value.  */
+	   || (GET_CODE (x) == SUBREG
+	       && FLOAT_MODE_P (GET_MODE (SUBREG_REG (x)))))
     {
-      /* Must be a hard reg that's not valid in MODE.  */
       result = gen_lowpart_common (mode, copy_to_reg (x));
       gcc_assert (result != 0);
       return result;