decl2.c (import_export_vtable): Suppress vtables for Java classes.

�
	* decl2.c (import_export_vtable):  Suppress vtables for Java classes.

From-SVN: r21878

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 942db4bef26715c0bf63b699d41670159960a464..037bf2b1bb7762c0507d4f3077b2d924a0382b12 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-08-20  Per Bothner  <bothner@cygnus.com>
+
+       * decl2.c (import_export_vtable):  Suppress vtables for Java classes.
+
 1998-08-20  Mark Mitchell  <mark@markmitchell.com>
 
        * decl.c (duplicate_decls): Always merge the old and new patterns

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 6ac0beeb1844b2c46f33ecd0356c35484ad9b84c..c0b12e503045ad20e0b189b34f82192e0c20249c 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2551,10 +2551,10 @@ import_export_vtable (decl, type, final)
     return;
 
   /* +e0 or +e1 */
-  if (write_virtuals < 2 && write_virtuals != 0)
+  if (write_virtuals < 0 || write_virtuals == 1 || TYPE_FOR_JAVA (type))
     {
       TREE_PUBLIC (decl) = 1;
-      if (write_virtuals < 0)
+      if (write_virtuals < 0 || TYPE_FOR_JAVA (type))
        DECL_EXTERNAL (decl) = 1;
       DECL_INTERFACE_KNOWN (decl) = 1;
     }