From: Jason Merrill <jason@rhino.cygnus.com>
Date: Sun, 25 Jan 1998 17:14:55 +0000 (+0000)
Subject: decl.c (cp_finish_decl): When bailing on a comdat variable, also unset DECL_NOT_REALL... 
X-Git-Tag: prereleases/egcs-1.0.2-prerelease~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03dd49a5ae6de1cfd79a19121907ab16c47caebb;p=thirdparty%2Fgcc.git

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

        * 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 7f0cc234c903..d864a63b3148 100644
--- 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 193a6fd74863..fad7cfa5e8ae 100644
--- 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;
+		}
 	    }
 	}