decl2.c (import_export_decl): If we clear DECL_NOT_REALLY_EXTERN, make sure DECL_EXTE...

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

From-SVN: r53576

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3adedeb13f3169d01ac23e7c4f334d1256137567..16bbf156bcfd3998a9e3f8575c8febc6c79bf6b0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-18  Jason Merrill  <jason@redhat.com>
+
+       * decl2.c (import_export_decl): If we clear
+       DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set.
+
 2002-05-15  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/6620

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index ee10fff29e3fa871ac6515ecbd7999855adf8147..238bde8d900d3e213cd9366833e4f517c6b5477a 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2481,7 +2481,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))
     {
@@ -2497,6 +2500,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);