diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4363a6812fa..0d04b58459d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 18 17:14:08 CEST 2002  Jan Hubicka  <jh@suse.cz>
+
+	* i386.h (SSE_FLOAT_MODE_P): Fix bogus conflict resolution
+	in last patch.
+
 2002-04-18  Jakub Jelinek  <jakub@redhat.com>
 
 	* fold-const.c (fold): Use (*lang_hooks.types.unsigned_type)
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 0a0ce26a45a..c37dc60c78c 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1316,7 +1316,7 @@ enum reg_class
 #define SSE_REG_P(N) (REG_P (N) && SSE_REGNO_P (REGNO (N)))
 
 #define SSE_FLOAT_MODE_P(MODE) \
-  ((MODE) == SFmode || (TARGET_SSE2 && (MODE) == DFmode))
+  ((TARGET_SSE && (MODE) == SFmode) || (TARGET_SSE2 && (MODE) == DFmode))
 
 #define MMX_REGNO_P(N) ((N) >= FIRST_MMX_REG && (N) <= LAST_MMX_REG)
 #define MMX_REG_P(XOP) (REG_P (XOP) && MMX_REGNO_P (REGNO (XOP)))