decl.c (cp_finish_decl): When bailing on a comdat variable, also unset DECL_NOT_REALL...

        * decl.c (cp_finish_decl): When bailing on a comdat variable, also
        unset DECL_NOT_REALLY_EXTERN.

From-SVN: r17480

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7f0cc234c903074e801c862061a32b280d06bcc3..d864a63b3148d34e99afc9fb2282723ed4785182 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 25 13:20:00 1998  Jason Merrill  <jason@rhino.cygnus.com>
+
+       * decl.c (cp_finish_decl): When bailing on a comdat variable, also
+       unset DECL_NOT_REALLY_EXTERN.
+
 Sat Dec 20 13:00:30 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
        * pt.c (instantiate_decl): Defer all templates but inline functions.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 193a6fd748639a495331cd14228595fb3cfef5ec..fad7cfa5e8aebea2f20f9507fd201169ead49c12 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6737,9 +6737,12 @@ cp_finish_decl (decl, init, asmspec_tree, need_pop, flags)
              if (flag_weak)
                make_decl_one_only (decl);
              else
-               /* we can't do anything useful; leave vars for explicit
-                   instantiation.  */
-               DECL_EXTERNAL (decl) = 1;
+               {
+                 /* we can't do anything useful; leave vars for explicit
+                    instantiation.  */
+                 DECL_EXTERNAL (decl) = 1;
+                 DECL_NOT_REALLY_EXTERN (decl) = 0;
+               }
            }
        }