diff options
| author | Jason Merrill <jason@redhat.com> | 2014-07-30 13:27:14 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-07-30 13:27:14 -0400 |
| commit | d5d0ed2d89a56273efe30331c3e94651134615e7 (patch) | |
| tree | 043925ba81282b0a865db1992b86c852a51fdf2f /gcc/cp/tree.c | |
| parent | ea3e455ac77a67e96a916c4c64249be8e20124cd (diff) | |
| download | gcc-d5d0ed2d89a56273efe30331c3e94651134615e7.zip gcc-d5d0ed2d89a56273efe30331c3e94651134615e7.tar.gz gcc-d5d0ed2d89a56273efe30331c3e94651134615e7.tar.bz2 | |
re PR lto/53808 (Undefined symbol when building a library with lto)
PR lto/53808
PR c++/61659
* pt.c (push_template_decl_real): Set DECL_COMDAT on templates.
(check_explicit_specialization): Clear it on specializations.
* decl.c (duplicate_decls, start_decl): Likewise.
(grokmethod, grokfndecl): Set DECL_COMDAT on inlines.
* method.c (implicitly_declare_fn): Set DECL_COMDAT. Determine
linkage after setting the appropriate flags.
* tree.c (decl_linkage): Don't check DECL_COMDAT.
* decl2.c (mark_needed): Mark clones.
(import_export_decl): Not here.
From-SVN: r213307
Diffstat (limited to 'gcc/cp/tree.c')
| -rw-r--r-- | gcc/cp/tree.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index f6c5693..1bfffb8 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -3722,23 +3722,15 @@ decl_linkage (tree decl) if (TREE_CODE (decl) == CONST_DECL) return decl_linkage (TYPE_NAME (DECL_CONTEXT (decl))); - /* Some things that are not TREE_PUBLIC have external linkage, too. - For example, on targets that don't have weak symbols, we make all - template instantiations have internal linkage (in the object - file), but the symbols should still be treated as having external - linkage from the point of view of the language. */ - if (VAR_OR_FUNCTION_DECL_P (decl) - && DECL_COMDAT (decl)) - return lk_external; - /* Things in local scope do not have linkage, if they don't have TREE_PUBLIC set. */ if (decl_function_context (decl)) return lk_none; /* Members of the anonymous namespace also have TREE_PUBLIC unset, but - are considered to have external linkage for language purposes. DECLs - really meant to have internal linkage have DECL_THIS_STATIC set. */ + are considered to have external linkage for language purposes, as do + template instantiations on targets without weak symbols. DECLs really + meant to have internal linkage have DECL_THIS_STATIC set. */ if (TREE_CODE (decl) == TYPE_DECL) return lk_external; if (VAR_OR_FUNCTION_DECL_P (decl)) |