From d306e2284361466ef7e32d964dc52bb669261d3e Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 29 Mar 2012 15:02:38 +0000
Subject: [PATCH] 	PR c++/52759 	* decl.c (start_decl): Don't call
 maybe_apply_pragma_weak 	if processing_template_decl.

	* g++.dg/ext/weak4.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185966 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                 | 6 ++++++
 gcc/cp/decl.c                    | 3 ++-
 gcc/testsuite/ChangeLog          | 3 +++
 gcc/testsuite/g++.dg/ext/weak4.C | 9 +++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/ext/weak4.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 166f559..4f9bae8 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 f021edf..8c5fda6 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 c1975c9..00ec7bb 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 0000000..5b3cce0
--- /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> &);
-- 
2.7.4