aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2001-01-19 16:07:21 -0500
committerJason Merrill <jason@gcc.gnu.org>2001-01-19 16:07:21 -0500
commit2a2a9e5a20c8a516fb89b70d3ccfe43b29116f62 (patch)
tree503d52daff191e55e8d04994ac9bfea475d1b5a2
parent7193d1dc3d0359e9f3257d3b75d5050fa73187b3 (diff)
downloadgcc-2a2a9e5a20c8a516fb89b70d3ccfe43b29116f62.zip
gcc-2a2a9e5a20c8a516fb89b70d3ccfe43b29116f62.tar.gz
gcc-2a2a9e5a20c8a516fb89b70d3ccfe43b29116f62.tar.bz2
* decl2.c (flag_vtable_thunks): Also depend on ENABLE_NEW_GXX_ABI.
From-SVN: r39142
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/decl2.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 661e692..7927428 100644
--- 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 18b864b..dd7cb1c 100644
--- 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. */