aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2002-05-18 00:47:31 -0400
committerJason Merrill <jason@gcc.gnu.org>2002-05-18 00:47:31 -0400
commitb41d214eefd060cbc586d06feff6367065738488 (patch)
treeff2b1967e42c02a870d262b5b772a86d58f1f76e /gcc
parentf24a153ab2b784ce27394592e4e58ee40645f476 (diff)
downloadgcc-b41d214eefd060cbc586d06feff6367065738488.zip
gcc-b41d214eefd060cbc586d06feff6367065738488.tar.gz
gcc-b41d214eefd060cbc586d06feff6367065738488.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3adedeb..16bbf15 100644
--- 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 ee10fff..238bde8 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);