revert last checkin

From-SVN: r53457

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da89625e155e7a24304885614e7d7f5273c03189..d5facc540d318404fc1a7deaed8ba686b95c03ad 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -5,10 +5,6 @@
        (build_base_path): Vtable contents are constant.
        * typeck.c (get_member_function_from_ptrfunc): Likewise.
 
-       * rtti.c (emit_tinfo_decl): Call import_export_decl.
-       * decl2.c (import_export_decl): Set DECL_NOT_REALLY_EXTERN on
-       tinfo decls by default.  Don't mess with the builtins.
-
 2002-05-12  Jason Merrill  <jason@redhat.com>
 
        * cp-lang.c (ok_to_generate_alias_set_for_type): Backend-created

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 2fd67ae8740ab380077773b3ce0d54b92f66fcbe..2054a37e545208b5264f54d7336994ca50fdc40f 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2514,7 +2514,6 @@ import_export_decl (decl)
       if (IS_AGGR_TYPE (ctype))
        import_export_class (ctype);
 
-      DECL_NOT_REALLY_EXTERN (decl) = 1;
       if (IS_AGGR_TYPE (ctype) && CLASSTYPE_INTERFACE_KNOWN (ctype)
          && TYPE_POLYMORPHIC_P (ctype)
          /* If -fno-rtti, we're not necessarily emitting this stuff with
@@ -2538,9 +2537,9 @@ import_export_decl (decl)
          if (flag_weak)
            comdat_linkage (decl);
        }
-      /* We used to exclude the builtin types here, but that broke
-        emit_support_tinfos.  Let rtti.c choose whether or not to emit
-        them.  */
+      else if (TYPE_BUILT_IN (ctype) 
+              && same_type_p (ctype, TYPE_MAIN_VARIANT (ctype)))
+       DECL_NOT_REALLY_EXTERN (decl) = 0;
       else
        comdat_linkage (decl);
     } 

diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 63ffcb7bef0f00b2bed1b4c6a30a140d0393ee32..16df801b0d0390727c1fa6fb57d8f6abef4d2213 100644 (file)
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -1462,11 +1462,9 @@ emit_tinfo_decl (decl_ptr, data)
   my_friendly_assert (TREE_TYPE (tinfo_decl) == tinfo_decl_type, 20000121);
   tinfo_type = TREE_TYPE (DECL_NAME (tinfo_decl));
   my_friendly_assert (tinfo_type != NULL_TREE, 20000120);
-
-  import_export_decl (tinfo_decl);
-  if (DECL_REALLY_EXTERN (tinfo_decl) || !DECL_NEEDED_P (tinfo_decl))
+  
+  if (!DECL_NEEDED_P (tinfo_decl))
     return 0;
-
   /* Say we've dealt with it.  */
   TREE_TYPE (DECL_NAME (tinfo_decl)) = NULL_TREE;