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

diff --git a/gcc/testsuite/gcc.dg/comp-return-1.c b/gcc/testsuite/gcc.dg/comp-return-1.c
new file mode 100644
index 000000000..82c398355
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/comp-return-1.c
@@ -0,0 +1,31 @@
+/* When merging a nonprototype definition of a function with a prior
+   prototype declaration, the composite type of the return types must
+   be formed rather than just copying the function type.  */
+/* Origin: Joseph Myers <jsm@polyomino.org.uk> */
+/* { dg-do compile } */
+
+typedef int a[];
+typedef int a5[5];
+typedef int a10[10];
+
+a *f1 ();
+a5 *f1 () { return 0; }
+
+a *f2 (void);
+a5 *f2 () { return 0; }
+
+a *f3 ();
+a5 *f3 (void) { return 0; }
+
+a *f4 (void);
+a5 *f4 (void) { return 0; }
+
+void
+g (void)
+{
+  a10 *x;
+  x = f1 (); /* { dg-error "incompatible" "f1" } */
+  x = f2 (); /* { dg-error "incompatible" "f2" } */
+  x = f3 (); /* { dg-error "incompatible" "f3" } */
+  x = f4 (); /* { dg-error "incompatible" "f4" } */
+}