diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b643950bfb1..5b72996f819 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-23  Janis Johnson  <janis187@us.ibm.com>
+
+	* toplev.c (process_options): Disable -fprefetch-loop-arrays with
+	-Os and issue a warning.
+
 2002-01-23  Zack Weinberg  <zack@codesourcery.com>
 
 	* doc/fragments.texi, doc/hostconfig.texi: Update to reflect
@@ -119,7 +124,7 @@
 2002-01-22  Janis Johnson  <janis187@us.ibm.com>
 
 	* Makefile.in (loop.o): Depend on OPTABS_H.
-	* loop.c (expand_builtin_prefetch): Check the prefetch operand
+	* loop.c (emit_prefetch_instructions): Check the prefetch operand
 	against the predicate.
 
 	PR target/5379
diff --git a/gcc/toplev.c b/gcc/toplev.c
index e8b6102d8d6..481c1923d39 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -4988,6 +4988,14 @@ process_options ()
     }
 #endif
 
+  /* This combination of options isn't handled for i386 targets and doesn't
+     make much sense anyway, so don't allow it.  */
+  if (flag_prefetch_loop_arrays && optimize_size)
+    {
+      warning ("-fprefetch-loop-arrays is not supported with -Os");
+      flag_prefetch_loop_arrays = 0;
+    }
+
 #ifndef OBJECT_FORMAT_ELF
   if (flag_function_sections && write_symbols != NO_DEBUG)
     warning ("-ffunction-sections may affect debugging on some targets");