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, 27 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/entry_7.f90 b/gcc/testsuite/gfortran.dg/entry_7.f90
new file mode 100644
index 000000000..b011fe63b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/entry_7.f90
@@ -0,0 +1,27 @@
+! { dg-do compile }
+! { dg-options "-std=legacy" }
+!
+! Check that PR20877 and PR25047 are fixed by the patch for
+! PR24558. Both modules would emit the error:
+! insert_bbt(): Duplicate key found!
+! because of the prior references to a module function entry.
+!
+! Contributed by Joost VandeVondele  <jv244@cam.ac.uk>
+!
+MODULE TT
+CONTAINS
+  FUNCTION K(I) RESULT(J)
+    ENTRY J() ! { dg-error "conflicts with RESULT attribute" }
+  END FUNCTION K
+
+  integer function foo ()
+    character*4 bar ! { dg-error "type CHARACTER" }
+    foo = 21
+    return
+  entry bar ()
+    bar = "abcd"
+  end function
+END MODULE TT
+
+
+! { dg-final { cleanup-modules "TT" } }