From b41d214eefd060cbc586d06feff6367065738488 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 18 May 2002 00:47:31 -0400 Subject: [PATCH] decl2.c (import_export_decl): If we clear DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set. * decl2.c (import_export_decl): If we clear DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set. From-SVN: r53576 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl2.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3adedeb13f3..16bbf156bcf 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-05-18 Jason Merrill + + * decl2.c (import_export_decl): If we clear + DECL_NOT_REALLY_EXTERN, make sure DECL_EXTERNAL is set. + 2002-05-15 Kriang Lerdsuwanakij PR c++/6620 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index ee10fff29e3..238bde8d900 100644 --- 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);