obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 40 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/char_unpack_2.f90 b/gcc/testsuite/gfortran.dg/char_unpack_2.f90
new file mode 100644
index 000000000..3b2c4a327
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/char_unpack_2.f90
@@ -0,0 +1,40 @@
+! Test unpack1 for character arrays.
+! { dg-do run }
+program main
+  implicit none
+  integer, parameter :: n1 = 3, n2 = 4, nv = 10, slen = 9
+  character (len = slen) :: field
+  character (len = slen), dimension (nv) :: vector
+  logical, dimension (n1, n2) :: mask
+  integer :: i1, i2, i
+
+  field = 'broadside'
+  mask (1, :) = (/ .true., .false., .true., .true. /)
+  mask (2, :) = (/ .true., .false., .false., .false. /)
+  mask (3, :) = (/ .false., .true., .true., .true. /)
+
+  do i = 1, nv
+    vector (i) = 'crespo' // '0123456789'(i:i)
+  end do
+
+  call test (unpack (vector, mask, field))
+contains
+  subroutine test (a)
+    character (len = slen), dimension (:, :) :: a
+
+    if (size (a, 1) .ne. n1) call abort
+    if (size (a, 2) .ne. n2) call abort
+
+    i = 0
+    do i2 = 1, n2
+      do i1 = 1, n1
+        if (mask (i1, i2)) then
+          i = i + 1
+          if (a (i1, i2) .ne. vector (i)) call abort
+        else
+          if (a (i1, i2) .ne. field) call abort
+        end if
+      end do
+    end do
+  end subroutine test
+end program main