diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 4e3178d4766..0a4269d46c9 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,11 @@
+2009-10-14  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* gcc.dg/graphite/graphite.exp (DEFAULT_CFLAGS_GRAPHITE_BLOCK):
+	Add -fno-loop-strip-mine and -fno-loop-interchange.
+	(DEFAULT_FLAGS_GRAPHITE_INTERCHANGE): Add -fno-loop-block and
+	-fno-loop-strip-mine.
+	* gfortran.dg/graphite/graphite.exp: Same.
+
 2009-10-14  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* gcc.dg/graphite/graphite.exp (DEFAULT_CFLAGS_GRAPHITE_BLOCK):
diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp
index 9ca200ea8f8..c4a8b2e748b 100644
--- a/gcc/testsuite/gcc.dg/graphite/graphite.exp
+++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp
@@ -43,7 +43,8 @@ dg-init
 set wait_to_run_files [lsort [glob -nocomplain $srcdir/$subdir/*.c ] ]
 
 # Flags using for block-* files.
-set DEFAULT_FLAGS_GRAPHITE_BLOCK "-O2 -floop-block -fdump-tree-graphite-all"
+set DEFAULT_FLAGS_GRAPHITE_BLOCK "-O2 -floop-block -fno-loop-strip-mine \
+ -fno-loop-interchange -fdump-tree-graphite-all"
 set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.c ] ]
 dg-runtest $block_files "" $DEFAULT_FLAGS_GRAPHITE_BLOCK
 foreach block_file $block_files {lremove wait_to_run_files $block_file}
@@ -55,7 +56,8 @@ dg-runtest $id_files "" $DEFAULT_FLAGS_GRAPHITE_IDENTITY
 foreach id_file $id_files {lremove wait_to_run_files $id_file}
 
 # Flags using for interchange-* files.
-set DEFAULT_FLAGS_GRAPHITE_INTERCHANGE "-O2 -fdump-tree-graphite-all -floop-interchange -ffast-math"
+set DEFAULT_FLAGS_GRAPHITE_INTERCHANGE "-O2 -fdump-tree-graphite-all \
+ -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math"
 set interchange_files [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.c ] ]
 dg-runtest $interchange_files "" $DEFAULT_FLAGS_GRAPHITE_INTERCHANGE
 foreach interchange_file $interchange_files {lremove wait_to_run_files $interchange_file}
diff --git a/gcc/testsuite/gfortran.dg/graphite/graphite.exp b/gcc/testsuite/gfortran.dg/graphite/graphite.exp
index 0746d375689..997453dd440 100644
--- a/gcc/testsuite/gfortran.dg/graphite/graphite.exp
+++ b/gcc/testsuite/gfortran.dg/graphite/graphite.exp
@@ -42,7 +42,8 @@ dg-init
 set wait_to_run_files [lsort [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ]
 
 # Flags using for block-* files.
-set DEFAULT_FLAGS_GRAPHITE_BLOCK "-O2 -floop-block -fdump-tree-graphite-all"
+set DEFAULT_FLAGS_GRAPHITE_BLOCK "-O2 -floop-block -fno-loop-strip-mine \
+ -fno-loop-interchange -fdump-tree-graphite-all"
 set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.\[fF\]{,90,95,03,08} ] ]
 gfortran-dg-runtest $block_files $DEFAULT_FLAGS_GRAPHITE_BLOCK
 foreach block_file $block_files {lremove wait_to_run_files $block_file}
@@ -54,7 +55,8 @@ gfortran-dg-runtest $id_files $DEFAULT_FLAGS_GRAPHITE_IDENTITY
 foreach id_file $id_files {lremove wait_to_run_files $id_file}
 
 # Flags using for interchange-* files.
-set DEFAULT_FLAGS_GRAPHITE_INTERCHANGE "-O2 -fdump-tree-graphite-all -floop-interchange"
+set DEFAULT_FLAGS_GRAPHITE_INTERCHANGE "-O2 -fdump-tree-graphite-all \
+ -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math"
 set interchange_files [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.\[fF\]{,90,95,03,08} ] ]
 gfortran-dg-runtest $interchange_files $DEFAULT_FLAGS_GRAPHITE_INTERCHANGE
 foreach interchange_file $interchange_files {lremove wait_to_run_files $interchange_file}