aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/decl.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cd58e5c..e4850d6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2000-01-16 Mark Mitchell <mark@codesourcery.com>
+ * decl.c (init_decl_processing): Complain if -fnew-abi
+ -fno-vtable-thunks is used.
+
* decl2.c (lang_decode_option): Don't couple flag_honor_std to
flag_new_abi.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 935fd3a..d8a57e5 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5956,6 +5956,11 @@ init_decl_processing ()
int wchar_type_size;
tree array_domain_type;
+ /* Check to see that the user did not specify an invalid combination
+ of command-line options. */
+ if (flag_new_abi && !flag_vtable_thunks)
+ fatal ("the new ABI requires vtable thunks");
+
/* Have to make these distinct before we try using them. */
lang_name_cplusplus = get_identifier ("C++");
lang_name_c = get_identifier ("C");