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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5feb18b..ae4493a 100644 (file)
--- 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 (file)
--- 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,