Backport:

        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.

From-SVN: r78965

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cfd1a6ba4294cdfc11b3c41df962a3f9ee93befa..95cfabcdfd0b47206f28dddd7bddb94036fe3569 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       Backport:
+       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-24  Jason Merrill  <jason@redhat.com>
 
        PR c++/13944

diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 7b4a248f0561cd3b66b8a1c4317cf168002abf2b..37bda3c97693d75dd2c1c284f34ac11d1075d14e 100644 (file)
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -761,7 +761,7 @@ tinfo_base_init (desc, 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,