On 11/03/2011 01:32 PM, Richard Henderson wrote:
> Indeed. The skeleton for libitm was libgomp. And libgomp does do
> fortran stuff, which leads directly to the two errant fortran
> references spotted by Joseph.
>
> Will fix.
Here's the fix for both gfortran references.
Committed to the branch.
r~
* configure.ac: Don't test for gfortran.
* configure: Rebuild.
* testsuite/lib/libitm.exp: Don't include gfortran-dg.exp.
* testsuite/libitm.c++/c++.exp: Don't use gfortran-dg-runtest.
diff --git a/libitm/configure.ac b/libitm/configure.ac
index 475b9d8..06a142c 100644
--- a/libitm/configure.ac
+++ b/libitm/configure.ac
@@ -136,13 +136,6 @@ AC_SUBST(enable_static)
AM_MAINTAINER_MODE
-# We need gfortran to compile parts of the library
-# We can't use AC_PROG_FC because it expects a fully working gfortran.
-#AC_PROG_FC(gfortran)
-FC="$GFORTRAN"
-AC_PROG_FC(gfortran)
-FCFLAGS="$FCFLAGS -Wall"
-
# For libtool versioning info, format is CURRENT:REVISION:AGE
libtool_VERSION=1:0:0
AC_SUBST(libtool_VERSION)
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
index 27e9156..008b51e 100644
--- a/libitm/testsuite/lib/libitm.exp
+++ b/libitm/testsuite/lib/libitm.exp
@@ -25,7 +25,6 @@ load_gcc_lib torture-options.exp
load_gcc_lib timeout.exp
load_gcc_lib timeout-dg.exp
load_gcc_lib gcc-dg.exp
-load_gcc_lib gfortran-dg.exp
set dg-do-what-default run
diff --git a/libitm/testsuite/libitm.c++/c++.exp
b/libitm/testsuite/libitm.c++/c++.exp
index 860a225..fcde9b7 100644
--- a/libitm/testsuite/libitm.c++/c++.exp
+++ b/libitm/testsuite/libitm.c++/c++.exp
@@ -53,7 +53,7 @@ if { $lang_test_file_found } {
}
# Main loop.
- gfortran-dg-runtest $tests $libstdcxx_includes
+ dg-runtest $tests "" $libstdcxx_includes
}
# All done.
