From: Gabriel Dos Reis <gdr@integrable-solutions.net>
Date: Fri, 5 Mar 2004 12:30:14 +0000 (+0000)
Subject: Backport:
X-Git-Tag: releases/gcc-3.3.4~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e825b4982eaf547e16aabf6da6273133da2b5ac7;p=thirdparty%2Fgcc.git

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 cfd1a6ba4294..95cfabcdfd0b 100644
--- 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 7b4a248f0561..37bda3c97693 100644
--- 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,