diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5feb18b33d7..ae4493a4c80 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -2,6 +2,12 @@
 
 	* error.c, search.c: Update copyright.
 
+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
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index a965383ad4e..0406e8f57ea 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,