From ad035db84b6136038f9919c72c2bdf140342bf4e Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 19 Aug 2014 13:29:41 -0400 Subject: [PATCH] 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 | 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 b366a4f429a..c60682e1787 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-08-19 Jason Merrill + + 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 * class.c (contains_empty_class_p): Remove. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 92a6dbc96c7..cc54ccace42 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 00000000000..153c0cfe7f0 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/spec1.C @@ -0,0 +1,4 @@ +// { dg-final { scan-assembler-not "weak" } } + +template struct A { static int i; }; +template<> int A::i = 42; -- 2.30.2