From e825b4982eaf547e16aabf6da6273133da2b5ac7 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Fri, 5 Mar 2004 12:30:14 +0000 Subject: [PATCH] Backport: 2004-02-04 Mark Mitchell PR c++/9941 * rtti.c (tinfo_base_init): Use import_export_tinfo to decide the linkage for the typeinfo name string. From-SVN: r78965 --- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/rtti.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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 + + Backport: + 2004-02-04 Mark Mitchell + + 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 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, -- 2.47.2