decl.c (wrapup_globals_for_namespace): Fix thinko in previous change.

	* decl.c (wrapup_globals_for_namespace): Fix thinko in previous
	change.

From-SVN: r26716

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cde573458801dcbf4a33e35df3e31f1b9694b139..b0f23ebfbd084077264fd0a06f662f65e32acd50 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-01  Mark Mitchell  <mark@codesourcery.com>
+
+       * decl.c (wrapup_globals_for_namespace): Fix thinko in previous
+       change.
+
 1999-04-30  Mark Mitchell  <mark@codesourcery.com>
 
        * class.c (build_vtable): Use build_lang_decl when building

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b37dbc8e6bc529d096dd84688fbb5854979444e8..921fd8322eeac63f2e5f02f2bc27e3d962c1f087 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2012,7 +2012,7 @@ wrapup_globals_for_namespace (namespace, data)
      wrapup_global_declarations from writing them out; we must process
      them ourselves in finish_vtable_vardecl.  */
   for (i = 0; i < len; ++i)
-    if (vtable_decl_p (vec[i], /*data=*/0))
+    if (vtable_decl_p (vec[i], /*data=*/0) && !DECL_EXTERNAL (vec[i]))
       {
        DECL_NOT_REALLY_EXTERN (vec[i]) = 1;
        DECL_EXTERNAL (vec[i]) = 1;