diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ebb41639fb..00e79b069b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-21  Roger Sayle  <roger@eyesopen.com>
+
+	* config/i386/i386.c (standard_80387_constant_p): Also prefer
+	the x87's load constant instructions when optimizing for size.
+
 2004-02-21  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* combine.c (SHIFT_COUNT_TRUNCATED): Remove.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3e5556d08e0..92d56a004a0 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4333,10 +4333,10 @@ standard_80387_constant_p (rtx x)
   if (x == CONST1_RTX (GET_MODE (x)))
     return 2;
 
-  /* For XFmode constants, try to find a special 80387 instruction on
-     those CPUs that benefit from them.  */
+  /* For XFmode constants, try to find a special 80387 instruction when
+     optimizing for size or on those CPUs that benefit from them.  */
   if (GET_MODE (x) == XFmode
-      && x86_ext_80387_constants & TUNEMASK)
+      && (optimize_size || x86_ext_80387_constants & TUNEMASK))
     {
       REAL_VALUE_TYPE r;
       int i;