diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-02-05 01:58:10 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-02-05 01:58:10 +0000 |
| commit | 6f3d0d2f8d6f7b1405a9e2548dd71dd0d26f3fe2 (patch) | |
| tree | 0a55b7a03e75a01af9bdc082abb440cb963069f2 | |
| parent | de8a2f87024fb7f57e92c0d243328e47c5a00ed2 (diff) | |
| download | gcc-6f3d0d2f8d6f7b1405a9e2548dd71dd0d26f3fe2.zip gcc-6f3d0d2f8d6f7b1405a9e2548dd71dd0d26f3fe2.tar.gz gcc-6f3d0d2f8d6f7b1405a9e2548dd71dd0d26f3fe2.tar.bz2 | |
re PR c++/9941 (typeinfo not generated correctly when #pragmas are involved)
PR c++/9941
* rtti.c (tinfo_base_init): Use import_export_tinfo to decide the
linkage for the typeinfo name string.
From-SVN: r77288
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5feb18b..ae4493a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -4,6 +4,12 @@ 2004-02-04 Mark Mitchell <mark@codesourcery.com> + PR c++/9941 + * rtti.c (tinfo_base_init): Use import_export_tinfo to decide the + linkage for the typeinfo name string. + +2004-02-04 Mark Mitchell <mark@codesourcery.com> + PR c++/13969 * cp-tree.h (fold_non_dependent_expr): New function. * parser.c (cp_parser_fold_non_dependent_expr): Remove. diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index a965383..0406e8f 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -760,7 +760,7 @@ tinfo_base_init (tree desc, tree target) TREE_STATIC (name_decl) = 1; DECL_EXTERNAL (name_decl) = 0; TREE_PUBLIC (name_decl) = 1; - comdat_linkage (name_decl); + import_export_tinfo (name_decl, target, typeinfo_in_lib_p (target)); /* External name of the string containing the type's name has a special name. */ SET_DECL_ASSEMBLER_NAME (name_decl, |