Merge from trunk revision 257954.gccgo

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

12 files changed, 12 insertions, 12 deletions

diff --git a/gcc/testsuite/gfortran.dg/goacc/fixed-1.f b/gcc/testsuite/gfortran.dg/goacc/fixed-1.f
index 6a454190102..974f2702260 100644
--- a/gcc/testsuite/gfortran.dg/goacc/fixed-1.f
+++ b/gcc/testsuite/gfortran.dg/goacc/fixed-1.f
@@ -4,7 +4,7 @@
 !$OMP PARALLEL
 !$ACC PARALLEL COPYIN(ARGC)
       IF (ARGC .NE. 0) THEN
-         CALL ABORT
+         STOP 1
       END IF
 !$ACC END PARALLEL
 !$OMP END PARALLEL
diff --git a/gcc/testsuite/gfortran.dg/goacc/fixed-2.f b/gcc/testsuite/gfortran.dg/goacc/fixed-2.f
index 2c2b0a38e00..afbc6b03d7f 100644
--- a/gcc/testsuite/gfortran.dg/goacc/fixed-2.f
+++ b/gcc/testsuite/gfortran.dg/goacc/fixed-2.f
@@ -7,7 +7,7 @@
 !$OMP xPARALLEL
 !$ACC xPARALLEL COPYIN(ARGC)	! { dg-error "Unclassifiable OpenACC directive" }
       IF (ARGC .NE. 0) THEN
-         CALL ABORT
+         STOP 1
       END IF
 !$ACC END PARALLEL 	! { dg-error "Unexpected" }
 !$OMP END PARALLEL
diff --git a/gcc/testsuite/gfortran.dg/goacc/gang-static.f95 b/gcc/testsuite/gfortran.dg/goacc/gang-static.f95
index 34810852d19..cc83c7dd65b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/gang-static.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/gang-static.f95
@@ -69,7 +69,7 @@ subroutine test (a, b, sarg, n)
   integer i
 
   do i = 1, n
-     if (a(i) .ne. b(i) + sarg) call abort ()
+     if (a(i) .ne. b(i) + sarg) STOP 1
   end do
 end subroutine test
 
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
index 516aedef24c..ef53324dd2a 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95
@@ -27,7 +27,7 @@ program main
   !$acc end kernels
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
index ff3788a96e2..2f1dcd603a1 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95
@@ -33,7 +33,7 @@ program main
   !$acc end data
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
index 60a5c96dac5..447e85d6448 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95
@@ -33,7 +33,7 @@ program main
   !$acc exit data copyout (c(0:n-1))
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
index ce04749f04a..4edb2889b7b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95
@@ -31,7 +31,7 @@ program main
   !$acc exit data copyout (a(0:n-1), b(0:n-1), c(0:n-1))
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
index d2de1389c31..fc113e1f660 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95
@@ -31,7 +31,7 @@ program main
   !$acc exit data copyout (a(0:n-1), c(0:n-1))
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
index 92872b27ff2..94522f58636 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95
@@ -31,7 +31,7 @@ program main
   !$acc end data
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
index 079712f29cb..b9c4aea074d 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95
@@ -24,7 +24,7 @@ contains
     !$acc end kernels
 
     do i = 0, n - 1
-       if (c(i) .ne. a(i) + b(i)) call abort
+       if (c(i) .ne. a(i) + b(i)) STOP 1
     end do
 
   end subroutine foo
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
index cc9a3a9a4bd..6dc7b2e0f28 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95
@@ -23,7 +23,7 @@ program main
   !$acc end kernels
 
   do i = 0, n - 1
-     if (c(i) .ne. a(i) + b(i)) call abort
+     if (c(i) .ne. a(i) + b(i)) STOP 1
   end do
 
 end program main
diff --git a/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f b/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f
index e715673de16..c6206e71773 100644
--- a/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f
+++ b/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f
@@ -8,7 +8,7 @@
 !$ACC PARALLEL                                                          &
 !$ACC& COPYIN(ARGC) ! { dg-error "directive cannot be specified within" }
       IF (ARGC .NE. 0) THEN
-         CALL ABORT
+         STOP 1
       END IF
 !$ACC END PARALLEL
 !$OMP END PARALLEL