From 1dac11893fcfb67b2a4f1e257ce7b77735daf1b3 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Aug 2014 17:29:41 +0000
Subject: [PATCH] 	PR lto/53808 	PR c++/61659 	* decl.c
 (maybe_commonize_var): Don't use DECL_COMDAT to trigger 
 comdat_linkage.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214177 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                 | 7 +++++++
 gcc/cp/decl.c                    | 4 ----
 gcc/testsuite/g++.dg/abi/spec1.C | 4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/abi/spec1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b366a4f..c60682e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-19  Jason Merrill  <jason@redhat.com>
+
+	PR lto/53808
+	PR c++/61659
+	* decl.c (maybe_commonize_var): Don't use DECL_COMDAT to trigger
+	comdat_linkage.
+
 2014-08-19  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* class.c (contains_empty_class_p): Remove.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 92a6dbc..cc54cca 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5099,10 +5099,6 @@ maybe_commonize_var (tree decl)
 	    }
 	}
     }
-  else if (DECL_LANG_SPECIFIC (decl) && DECL_COMDAT (decl))
-    /* Set it up again; we might have set DECL_INITIAL since the last
-       time.  */
-    comdat_linkage (decl);
 }
 
 /* Issue an error message if DECL is an uninitialized const variable.  */
diff --git a/gcc/testsuite/g++.dg/abi/spec1.C b/gcc/testsuite/g++.dg/abi/spec1.C
new file mode 100644
index 0000000..153c0cf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/spec1.C
@@ -0,0 +1,4 @@
+// { dg-final { scan-assembler-not "weak" } }
+
+template <class T> struct A { static int i; };
+template<> int A<int>::i = 42;
-- 
2.7.4