re PR lto/53808 (Undefined symbol when building a library with lto)

	PR lto/53808
	PR c++/61659
	* decl.c (maybe_commonize_var): Don't use DECL_COMDAT to trigger
	comdat_linkage.

From-SVN: r214177

gcc/cp/ChangeLog

+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.

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.  */

gcc/testsuite/g++.dg/abi/spec1.C

+// { dg-final { scan-assembler-not "weak" } }
+
+template <class T> struct A { static int i; };
+template<> int A<int>::i = 42;