diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e779f45bb7b541bb4bcc548fe1d59ac6a55abc7a..db0924d2ade1465efbcbccb610698752cf2c2e87 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 10 18:48:55 CEST 2002  Jan Hubicka  <jh@suse.cz>
+
+	* i386.c (ix86_init_mmx_sse_builtins): Fix thinko.
+
 2002-07-10  Jeffrey A Law  <law@redhat.com>
 
         * mn10200.c (expand_epilogue): Fix test to determine which scratch
@@ -1191,6 +1195,7 @@ Thu Jun 20 00:26:53 2002  Denis Chertykov  <denisc@overta.ru>
 	at start of buffer.
 	* gcc.c (trad_capable_cpp): Use cc1 always.
 
+>>>>>>> 1.14808
 2002-06-20  Jeffrey Law  <law@redhat.com>
 
 	* i386.h (TARGET_DEFAULT): Do not turn on frame pointer
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 819f0d72cc0cf717e84cd7904a261ffd2106a70a..a17599a96a34d6d71a06e3cfd00c2742ff340467 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -11941,7 +11941,7 @@ ix86_init_mmx_sse_builtins ()
 				long_long_unsigned_type_node, NULL_TREE);
 
   tree v2si_ftype_v2sf
-    = build_function_type_list (V2SI_type_node, V2SFmode, NULL_TREE);
+    = build_function_type_list (V2SI_type_node, V2SF_type_node, NULL_TREE);
   tree v2sf_ftype_v2si
     = build_function_type_list (V2SF_type_node, V2SI_type_node, NULL_TREE);
   tree v2si_ftype_v2si