diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e1b6173caa2..dfd76ab6147f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/i386/i386.c (ix86_option_override_internal): Don't set
+	-fprefetch-loop-arrays if optimizing for size.
+
 2015-04-12  Jan Hubicka  <hubicka@ucw.cz>
 	    Gerald Pfeifer  <gerald@pfeifer.com>
 
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 110ec4adc681..b442da9802e0 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4168,6 +4168,7 @@ ix86_option_override_internal (bool main_args_p,
   if (opts->x_flag_prefetch_loop_arrays < 0
       && HAVE_prefetch
       && (opts->x_optimize >= 3 || opts->x_flag_profile_use)
+      && !opts->x_optimize_size
       && TARGET_SOFTWARE_PREFETCHING_BENEFICIAL)
     opts->x_flag_prefetch_loop_arrays = 1;