--- tests/scalapack/make.inc.orig	2008-03-13 22:36:06.119890888 +0000
+++ tests/scalapack/make.inc	2008-03-13 22:54:58.201781899 +0000
@@ -59,6 +59,9 @@
 IFACE_PART = _ilp64
 COPTS = -DMKL_ILP64
 FOPTS = -i8
+ifeq ($(compiler),gnu)
+FOPTS = -fdefault-integer-8
+endif
 else
 ADD_IFACE = _lp64
 IFACE_PART = _lp64
@@ -203,7 +206,7 @@
 # Compiler flags
 F77FLAGS=-w -u $(OPTS)
 ifeq ($(comp),gnu)
-F77FLAGS=$(OPTS) -ff90 -fno-globals -Wno-globals
+F77FLAGS=$(OPTS)
 endif
 # Remove objects variable
 RMOBJ=rm -f *.o core work.pc*
