Revert "Silly workaround for coverage build with gcc-10."

This reverts commit d345b5dad90a1ec9829011b9188185aaf4d3240a.

The problem with gcc was likely fixed with PR fortran/95847
(see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95847)

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/exscanf.f b/teshsuite/smpi/mpich3-test/f77/coll/exscanf.f
index 2f8b897..27de6b9 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/exscanf.f
+++ b/teshsuite/smpi/mpich3-test/f77/coll/exscanf.f
@@ -2,6 +2,25 @@ C -*- Mode: Fortran; -*-
 C
 C  (C) 2003 by Argonne National Laboratory.
 C      See COPYRIGHT in top-level directory.
+C
+      subroutine uop( cin, cout, count, datatype )
+      implicit none
+      include 'mpif.h'
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+      
+      if (.false.) then
+         if (datatype .ne. MPI_INTEGER) then
+            write(6,*) 'Invalid datatype passed to user_op()'
+            return
+         endif
+      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
 C
       program main
       implicit none
@@ -88,22 +107,3 @@ C (rank)(rank-1)/2 and -i
       call mtest_finalize( errs )
       call mpi_finalize( ierr )
       end
-C
-      subroutine uop( cin, cout, count, datatype )
-      implicit none
-      include 'mpif.h'
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-      
-      if (.false.) then
-         if (datatype .ne. MPI_INTEGER) then
-            write(6,*) 'Invalid datatype passed to user_op()'
-            return
-         endif
-      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/redscatf.f b/teshsuite/smpi/mpich3-test/f77/coll/redscatf.f
index ecb04e9..efd6c06 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/redscatf.f
+++ b/teshsuite/smpi/mpich3-test/f77/coll/redscatf.f
@@ -2,6 +2,26 @@ C -*- Mode: Fortran; -*-
 C
 C  (C) 2011 by Argonne National Laboratory.
 C      See COPYRIGHT in top-level directory.
+C
+      subroutine uop( cin, cout, count, datatype )
+      implicit none
+      include 'mpif.h'
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+
+      if (.false.) then
+         if (datatype .ne. MPI_INTEGER) then
+            write(6,*) 'Invalid datatype ',datatype,
+     &           ' passed to user_op()'
+            return
+         endif
+      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
 C
 C Test of reduce scatter.
 C
@@ -66,23 +86,3 @@ C recvbuf should be size * (rank + i)
       call mpi_finalize( ierr )
 
       end
-C
-      subroutine uop( cin, cout, count, datatype )
-      implicit none
-      include 'mpif.h'
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-
-      if (.false.) then
-         if (datatype .ne. MPI_INTEGER) then
-            write(6,*) 'Invalid datatype ',datatype,
-     &           ' passed to user_op()'
-            return
-         endif
-      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/reducelocalf.f b/teshsuite/smpi/mpich3-test/f77/coll/reducelocalf.f
index aaaee12..6037308 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/reducelocalf.f
+++ b/teshsuite/smpi/mpich3-test/f77/coll/reducelocalf.f
@@ -6,6 +6,24 @@ C
 C
 C Test Fortran MPI_Reduce_local with MPI_OP_SUM and with user-defined operation.
 C
+      subroutine user_op( invec, outvec, count, datatype )
+      implicit none
+      include 'mpif.h'
+      integer invec(*), outvec(*)
+      integer count, datatype
+      integer ii
+
+      if (datatype .ne. MPI_INTEGER) then
+         write(6,*) 'Invalid datatype passed to user_op()'
+         return
+      endif
+      
+      do ii=1, count
+         outvec(ii) = invec(ii) * 2 + outvec(ii)
+      enddo
+
+      end
+
       program main
       implicit none
       include 'mpif.h'
@@ -77,21 +95,3 @@ C        Check if the result is correct
       call mpi_finalize(ierr)
 
       end
-
-      subroutine user_op( invec, outvec, count, datatype )
-      implicit none
-      include 'mpif.h'
-      integer invec(*), outvec(*)
-      integer count, datatype
-      integer ii
-
-      if (datatype .ne. MPI_INTEGER) then
-         write(6,*) 'Invalid datatype passed to user_op()'
-         return
-      endif
-      
-      do ii=1, count
-         outvec(ii) = invec(ii) * 2 + outvec(ii)
-      enddo
-
-      end

diff --git a/teshsuite/smpi/mpich3-test/f77/coll/uallreducef.f b/teshsuite/smpi/mpich3-test/f77/coll/uallreducef.f
index 6a74bf0..566d294 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/coll/uallreducef.f
+++ b/teshsuite/smpi/mpich3-test/f77/coll/uallreducef.f
@@ -6,6 +6,23 @@ C
 C
 C Test user-defined operations.  This tests a simple commutative operation
 C
+      subroutine uop( cin, cout, count, datatype )
+      implicit none
+      include 'mpif.h'
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+      
+C      if (datatype .ne. MPI_INTEGER) then
+C         print *, 'Invalid datatype (',datatype,') passed to user_op()'
+C         return
+C      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
+
       program main
       implicit none
       include 'mpif.h'
@@ -44,20 +61,3 @@ C         Check that all results are correct
       call mtest_finalize(errs)
       call mpi_finalize(ierr)
       end
-
-      subroutine uop( cin, cout, count, datatype )
-      implicit none
-      include 'mpif.h'
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-      
-C      if (datatype .ne. MPI_INTEGER) then
-C         print *, 'Invalid datatype (',datatype,') passed to user_op()'
-C         return
-C      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/exscanf90.f90 b/teshsuite/smpi/mpich3-test/f90/coll/exscanf90.f90
index 5444f38..59cb7e4 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/exscanf90.f90
+++ b/teshsuite/smpi/mpich3-test/f90/coll/exscanf90.f90
@@ -3,6 +3,24 @@
 !
 !  (C) 2003 by Argonne National Laboratory.
 !      See COPYRIGHT in top-level directory.
+!
+      subroutine uop( cin, cout, count, datatype )
+      use mpi
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+      
+      if (.false.) then
+         if (datatype .ne. MPI_INTEGER) then
+            write(6,*) 'Invalid datatype passed to user_op()'
+            return
+         endif
+      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
 !
       program main
       use mpi
@@ -90,21 +108,3 @@
       call mtest_finalize( errs )
       call mpi_finalize( ierr )
       end
-!
-      subroutine uop( cin, cout, count, datatype )
-      use mpi
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-      
-      if (.false.) then
-         if (datatype .ne. MPI_INTEGER) then
-            write(6,*) 'Invalid datatype passed to user_op()'
-            return
-         endif
-      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/redscatf90.f90 b/teshsuite/smpi/mpich3-test/f90/coll/redscatf90.f90
index 12b51b2..496d178 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/redscatf90.f90
+++ b/teshsuite/smpi/mpich3-test/f90/coll/redscatf90.f90
@@ -4,6 +4,23 @@
 !  (C) 2011 by Argonne National Laboratory.
 !      See COPYRIGHT in top-level directory.
 !
+      subroutine uop( cin, cout, count, datatype )
+      use mpi
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+      
+      if (.false.) then
+         if (datatype .ne. MPI_INTEGER) then
+            write(6,*) 'Invalid datatype ',datatype,' passed to user_op()'
+            return
+         endif
+      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
 !
 ! Test of reduce scatter.
 !
@@ -71,21 +88,3 @@
       call mpi_finalize( ierr )
 
       end
-
-      subroutine uop( cin, cout, count, datatype )
-      use mpi
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-      
-      if (.false.) then
-         if (datatype .ne. MPI_INTEGER) then
-            write(6,*) 'Invalid datatype ',datatype,' passed to user_op()'
-            return
-         endif
-      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/reducelocalf90.f90 b/teshsuite/smpi/mpich3-test/f90/coll/reducelocalf90.f90
index d678ca9..1422952 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/reducelocalf90.f90
+++ b/teshsuite/smpi/mpich3-test/f90/coll/reducelocalf90.f90
@@ -7,6 +7,23 @@
 !
 ! Test Fortran MPI_Reduce_local with MPI_OP_SUM and with user-defined operation.
 !
+      subroutine user_op( invec, outvec, count, datatype )
+      use mpi
+      integer invec(*), outvec(*)
+      integer count, datatype
+      integer ii
+
+      if (datatype .ne. MPI_INTEGER) then
+         write(6,*) 'Invalid datatype passed to user_op()'
+         return
+      endif
+      
+      do ii=1, count
+         outvec(ii) = invec(ii) * 2 + outvec(ii)
+      enddo
+
+      end
+
       program main
       use mpi
       integer max_buf_size
@@ -77,20 +94,3 @@
       call mpi_finalize(ierr)
 
       end
-
-      subroutine user_op( invec, outvec, count, datatype )
-      use mpi
-      integer invec(*), outvec(*)
-      integer count, datatype
-      integer ii
-
-      if (datatype .ne. MPI_INTEGER) then
-         write(6,*) 'Invalid datatype passed to user_op()'
-         return
-      endif
-      
-      do ii=1, count
-         outvec(ii) = invec(ii) * 2 + outvec(ii)
-      enddo
-
-      end

diff --git a/teshsuite/smpi/mpich3-test/f90/coll/uallreducef90.f90 b/teshsuite/smpi/mpich3-test/f90/coll/uallreducef90.f90
index cd0ae1e..574d649 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/coll/uallreducef90.f90
+++ b/teshsuite/smpi/mpich3-test/f90/coll/uallreducef90.f90
@@ -7,6 +7,22 @@
 !
 ! Test user-defined operations.  This tests a simple commutative operation
 !
+      subroutine uop( cin, cout, count, datatype )
+      use mpi
+      integer cin(*), cout(*)
+      integer count, datatype
+      integer i
+      
+      if (datatype .ne. MPI_INTEGER) then
+         print *, 'Invalid datatype (',datatype,') passed to user_op()'
+         return
+      endif
+
+      do i=1, count
+         cout(i) = cin(i) + cout(i)
+      enddo
+      end
+
       program main
       use mpi
       external uop
@@ -49,19 +65,3 @@
       call mtest_finalize(errs)
       call mpi_finalize(ierr)
       end
-
-      subroutine uop( cin, cout, count, datatype )
-      use mpi
-      integer cin(*), cout(*)
-      integer count, datatype
-      integer i
-      
-      if (datatype .ne. MPI_INTEGER) then
-         print *, 'Invalid datatype (',datatype,') passed to user_op()'
-         return
-      endif
-
-      do i=1, count
-         cout(i) = cin(i) + cout(i)
-      enddo
-      end