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, 18 insertions, 18 deletions

diff --git a/gcc/testsuite/gfortran.dg/subref_array_pointer_2.f90 b/gcc/testsuite/gfortran.dg/subref_array_pointer_2.f90
index e96d75507d9..f190fa8ca70 100644
--- a/gcc/testsuite/gfortran.dg/subref_array_pointer_2.f90
+++ b/gcc/testsuite/gfortran.dg/subref_array_pointer_2.f90
@@ -36,60 +36,60 @@
   ptr => tar1%i
   ptr = ptr + 1              ! check the scalarizer is OK
 
-  if (any (ptr .ne. (/3, 5/))) call abort ()
-  if (any ((/ptr(1), ptr(2)/) .ne. (/3, 5/))) call abort ()
-  if (any (tar1%i .ne. (/3, 5/))) call abort ()
+  if (any (ptr .ne. (/3, 5/))) STOP 1
+  if (any ((/ptr(1), ptr(2)/) .ne. (/3, 5/))) STOP 2
+  if (any (tar1%i .ne. (/3, 5/))) STOP 3
 
 ! Make sure that the other components are not touched.
-  if (any (tar1%r .ne. (/1.0, 3.0/))) call abort ()
-  if (any (tar1%chr .ne. (/"abc", "efg"/))) call abort ()
+  if (any (tar1%r .ne. (/1.0, 3.0/))) STOP 4
+  if (any (tar1%chr .ne. (/"abc", "efg"/))) STOP 5
 
 ! Check that the pointer is passed correctly as an actual argument.
   call foo (ptr)
-  if (any (tar1%i .ne. (/2, 4/))) call abort ()
+  if (any (tar1%i .ne. (/2, 4/))) STOP 6
 
 ! And that dummy pointers are OK too.
   call bar (ptr)
-  if (any (tar1%i .ne. (/101, 103/))) call abort ()
+  if (any (tar1%i .ne. (/101, 103/))) STOP 7
 
 !_______________substring subreference___________
   ptr2 => tar2(:)(2:3)
   ptr2 = ptr2(:)(2:2)//"z"   ! again, check the scalarizer
 
-  if (any (ptr2 .ne. (/"cz", "gz"/))) call abort ()
-  if (any ((/ptr2(1), ptr2(2)/) .ne. (/"cz", "gz"/))) call abort ()
-  if (any (tar2 .ne. (/"aczd", "egzh"/))) call abort ()
+  if (any (ptr2 .ne. (/"cz", "gz"/))) STOP 8
+  if (any ((/ptr2(1), ptr2(2)/) .ne. (/"cz", "gz"/))) STOP 9
+  if (any (tar2 .ne. (/"aczd", "egzh"/))) STOP 10
 
 !_______________substring component subreference___________
   ptr2 => tar1(:)%chr(1:2)
   ptr2 = ptr2(:)(2:2)//"q"   ! yet again, check the scalarizer
-  if (any (ptr2 .ne. (/"bq","fq"/))) call abort ()
-  if (any (tar1%chr .ne. (/"bqc","fqg"/))) call abort ()
+  if (any (ptr2 .ne. (/"bq","fq"/))) STOP 11
+  if (any (tar1%chr .ne. (/"bqc","fqg"/))) STOP 12
 
 !_______________trailing array element subreference___________
   ptr3 => tar5%r(1,2)
   ptr3 = (/99.0, 999.0/)
-  if (any (tar5(1)%r .ne. reshape ((/1.0,2.0,99.0,4.0/), sh))) call abort ()
-  if (any (tar5(2)%r .ne. reshape ((/5.0,6.0,999.0,8.0/), sh))) call abort ()
+  if (any (tar5(1)%r .ne. reshape ((/1.0,2.0,99.0,4.0/), sh))) STOP 13
+  if (any (tar5(2)%r .ne. reshape ((/5.0,6.0,999.0,8.0/), sh))) STOP 14
 
 !_______________forall assignment___________
   ptr2 => tar2(:)(1:2)
   forall (i = 1:2) ptr2(i)(1:1) = "z"
-  if (any (tar2 .ne. (/"zczd", "zgzh"/))) call abort ()
+  if (any (tar2 .ne. (/"zczd", "zgzh"/))) STOP 15
 
 !_______________something more complicated___________
   tar3%t => tar1
   ptr3 => tar3%t%r
   ptr3 = cos (ptr3)
-  if (any (abs(ptr3 - (/cos(1.0_4), cos(3.0_4)/)) >= epsilon(1.0_4))) call abort ()
+  if (any (abs(ptr3 - (/cos(1.0_4), cos(3.0_4)/)) >= epsilon(1.0_4))) STOP 16
 
   ptr2 => tar3%t(:)%chr(2:3)
   ptr2 = " x"
-  if (any (tar1%chr .ne. (/"b x", "f x"/))) call abort ()
+  if (any (tar1%chr .ne. (/"b x", "f x"/))) STOP 17
 
 !_______________check non-subref works still___________
   ptr2 => tar4
-  if (any (ptr2 .ne. (/"ab","cd"/))) call abort ()
+  if (any (ptr2 .ne. (/"ab","cd"/))) STOP 18
 
 contains
   subroutine foo (arg)