Merge from trunk revision 257954.gccgo

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@257955 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 5 deletions

diff --git a/gcc/testsuite/gfortran.dg/function_kinds_4.f90 b/gcc/testsuite/gfortran.dg/function_kinds_4.f90
index d0e48f6b4d2..6d800ee6fdc 100644
--- a/gcc/testsuite/gfortran.dg/function_kinds_4.f90
+++ b/gcc/testsuite/gfortran.dg/function_kinds_4.f90
@@ -19,7 +19,7 @@ integer(i1) function three()
   use m1, only: i2
   use m2                ! This provides the function kind
   three = i1
-  if(three /= kind(three)) call abort()
+  if(three /= kind(three)) STOP 1
 end function three
 
 ! At one stage during the development of the patch, this started failing
@@ -39,17 +39,17 @@ implicit none
  real (kind(0d0)) foo
  i = one()
  i = two()
- if(three() /= 8) call abort()
- if (int(foo()) /= 8) call abort ()
+ if(three() /= 8) STOP 2
+ if (int(foo()) /= 8) STOP 3
 contains
  integer(i1) function one()  ! Host associated kind
-   if (kind(one) /= 4) call abort()
+   if (kind(one) /= 4) STOP 4
    one = 1
  end function one
  integer(i1) function two()  ! Use associated kind
    use m1, only: i2
    use m2
-   if (kind(two) /= 8) call abort()
+   if (kind(two) /= 8) STOP 5
    two = 1
  end function two
 end program main