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, 8 insertions, 9 deletions

diff --git a/gcc/testsuite/gfortran.dg/associate_22.f90 b/gcc/testsuite/gfortran.dg/associate_22.f90
index edf59321dd5..35daf89098d 100644
--- a/gcc/testsuite/gfortran.dg/associate_22.f90
+++ b/gcc/testsuite/gfortran.dg/associate_22.f90
@@ -9,30 +9,29 @@ program foo
    ! This works.
    s = 'abc'
    associate(t => s)
-      if (trim(t) /= 'abc') call abort
+      if (trim(t) /= 'abc') STOP 1
    end associate
 
    ! This failed.
    associate(u => 'abc')
-      if (trim(u) /= 'abc') call abort
+      if (trim(u) /= 'abc') STOP 2
    end associate
 
    ! This failed.
    a = s // 'abc'
    associate(v => s // 'abc')
-      if (trim(v) /= trim(a)) call abort
+      if (trim(v) /= trim(a)) STOP 3
    end associate
 
    ! This failed.
-   ! This still doesn't work correctly, see PR 83344
-!   a = trim(s) // 'abc'
-!   associate(w => trim(s) // 'abc')
-!      if (trim(w) /= trim(a)) call abort
-!   end associate
+   a = trim(s) // 'abc'
+   associate(w => trim(s) // 'abc')
+      if (trim(w) /= trim(a)) STOP 4
+   end associate
 
    ! This failed.
    associate(x => trim('abc'))
-      if (trim(x) /= 'abc') call abort
+      if (trim(x) /= 'abc') STOP 5
    end associate
 
 end program foo