diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib4.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib4.C
new file mode 100644
index 00000000000..5200eac9d92
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib4.C
@@ -0,0 +1,24 @@
+// Test that attributes are really applied to function declarations under
+// various conditions.
+// Contributed by Jason Merrill (jason@cygnus.com)
+// Special g++ Options: -Wformat
+// Build don't link:
+
+#define PF __attribute__ ((format (printf, 1, 2)))
+
+struct A {
+  static PF void f (char *, ...);
+  friend PF void g (char *, ...);
+  static void test ();
+};
+
+void PF h (char *, ...);
+void PF k (char *, ...) { }
+
+void A::test ()
+{
+  f ("%f", 42);			// WARNING - 
+  g ("%f", 42);			// WARNING - 
+  h ("%f", 42);			// WARNING - 
+  k ("%f", 42);			// WARNING - 
+}