re PR c++/6611 (Non-weak emission of `std::__default_alloc_template[...]' on platform...

        PR c++/6611
        * decl2.c (import_export_decl): If we clear
        DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set.

From-SVN: r55243

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bbb5eb344ce114ab781088b5e98d051a6fbcd2d0..f7a26b9f0688feea393aef27e7a6507f9a55a245 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-18  Jason Merrill  <jason@redhat.com>
+
+       PR c++/6611
+       * decl2.c (import_export_decl): If we clear
+       DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set.
+
 2002-07-03  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/6944

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 0ce3d8fdedf3a999d086265513463436c29bfe7e..c5ed336b6250d1b6413d18fd2c94650adcbad567 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2497,7 +2497,10 @@ import_export_decl (decl)
            comdat_linkage (decl);
        }
       else
-       DECL_NOT_REALLY_EXTERN (decl) = 0;
+       {
+         DECL_EXTERNAL (decl) = 1;
+         DECL_NOT_REALLY_EXTERN (decl) = 0;
+       }
     }
   else if (DECL_FUNCTION_MEMBER_P (decl))
     {
@@ -2513,6 +2516,9 @@ import_export_decl (decl)
                         && ! flag_implement_inlines
                         && !DECL_VINDEX (decl)));
 
+             if (!DECL_NOT_REALLY_EXTERN (decl))
+               DECL_EXTERNAL (decl) = 1;
+
              /* Always make artificials weak.  */
              if (DECL_ARTIFICIAL (decl) && flag_weak)
                comdat_linkage (decl);