* decl2.c (flag_vtable_thunks): Also depend on ENABLE_NEW_GXX_ABI.

From-SVN: r39142

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 661e6922b6bdd1815b9dc0813002b60246a50a3b..79274281bed0530619d7d532c458cb6e34cc406d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-19  Jason Merrill  <jason@redhat.com>
+
+       * decl2.c (flag_vtable_thunks): Also depend on ENABLE_NEW_GXX_ABI.
+
+       * decl.c (init_decl_processing): Just force -fvtable-thunks on if
+       -fnew-abi.
+
 2001-01-19  Ute Pelkmann  <scope.muc@t-online.de>
 
        * decl2.c (arg_assoc_class): Fix double iteration logic.

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 18b864b730c0219b176e251b5ceea0f5901a56d4..dd7cb1cb50b887a47c35d732188ad997a47786a1 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -204,10 +204,14 @@ int warn_ctor_dtor_privacy = 1;
 /* True if we want to implement vtables using "thunks".
    The default is off.  */
 
+#if ENABLE_NEW_GXX_ABI
+int flag_vtable_thunks = 1;
+#else
 #ifndef DEFAULT_VTABLE_THUNKS
 #define DEFAULT_VTABLE_THUNKS 0
 #endif
 int flag_vtable_thunks = DEFAULT_VTABLE_THUNKS;
+#endif
 
 /* Nonzero means generate separate instantiation control files and juggle
    them at link time.  */