From 690a34e57ea7a0a584af01421aae75ef66b2d6f3 Mon Sep 17 00:00:00 2001 From: law Date: Sun, 25 Jan 1998 17:14:55 +0000 Subject: [PATCH] * decl.c (cp_finish_decl): When bailing on a comdat variable, also unset DECL_NOT_REALLY_EXTERN. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/egcs_1_00_branch@17480 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f0cc234c90..d864a63b314 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 25 13:20:00 1998 Jason Merrill + + * 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 * pt.c (instantiate_decl): Defer all templates but inline functions. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 193a6fd7486..fad7cfa5e8a 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; + } } } -- 2.11.4.GIT