diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 166f559af105e02e2de9c9aa8b76fb1246f61d48..4f9bae85c52e3c482e0e424377c952457145663a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/52759
+	* decl.c (start_decl): Don't call maybe_apply_pragma_weak
+	if processing_template_decl.
+
 2012-03-29  Jason Merrill  <jason@redhat.com>
 
 	PR c++/52743
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index f021edf36e5829e5c8f8944a90df956ce578b097..8c5fda65f643ac2cf5d1111c6ead1d45d12ab07c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4431,7 +4431,8 @@ start_decl (const cp_declarator *declarator,
     }
 
   /* If #pragma weak was used, mark the decl weak now.  */
-  maybe_apply_pragma_weak (decl);
+  if (!processing_template_decl)
+    maybe_apply_pragma_weak (decl);
 
   if (TREE_CODE (decl) == FUNCTION_DECL
       && DECL_DECLARED_INLINE_P (decl)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c1975c9863b5d7c1455126102a7581fe986986c5..00ec7bb855f6050c8a4e03069ff11f22c8d77535 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-29  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/52759
+	* g++.dg/ext/weak4.C: New test.
+
 	PR tree-optimization/52760
 	* gcc.c-torture/execute/pr52760.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/ext/weak4.C b/gcc/testsuite/g++.dg/ext/weak4.C
new file mode 100644
index 0000000000000000000000000000000000000000..5b3cce05cd90f3f1ecc5fff63a24f658b9d9f2e0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/weak4.C
@@ -0,0 +1,9 @@
+// PR c++/52759
+// { dg-do compile }
+// { dg-require-weak "" }
+// { dg-options "" }
+#pragma weak foo
+template <typename T>
+struct A { };
+template <typename T>
+void bar (A<T> &);