diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 189234a3a34f..d77e4425cd32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-27  Sebastian Pop  <s.pop@samsung.com>
+
+	* toplev.c (process_options): Do not use flag_loop_block,
+	flag_loop_interchange, and flag_loop_strip_mine.  Add check for
+	flag_loop_optimize_isl.
+
 2015-08-27  Sebastian Pop  <s.pop@samsung.com>
 
 	* Makefile.in (OBJS): Remove graphite-blocking.o and
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 39967d0b298c..926224a4c204 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1316,10 +1316,8 @@ process_options (void)
 
 #ifndef HAVE_isl
   if (flag_graphite
+      || flag_loop_optimize_isl
       || flag_graphite_identity
-      || flag_loop_block
-      || flag_loop_interchange
-      || flag_loop_strip_mine
       || flag_loop_parallelize_all)
     sorry ("Graphite loop optimizations cannot be used (ISL is not available)" 
 	   "(-fgraphite, -fgraphite-identity, -floop-block, "