diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 8 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f13f1cf..5dedc9c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 1999-09-04 Mark Mitchell <mark@codesourcery.com> + * decl.c (init_decl_processing): Set mark_lang_status. + (lang_mark_false_label_stack): Adjust prototype. + * decl2.c (grok_function_init): Remove extraneous declaration of + abort_fndecl. + * Make-lang.in (cc1plus): Remove dependency on GGC. * Makefile.in (OBJS): Don't mention ggc-simple.o. (OBJDEPS): Don't mention ggc-simple.o. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index bb1b8b9..4fc9f8b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6205,6 +6205,7 @@ init_decl_processing () per-function globals. */ save_lang_status = &push_cp_function_context; restore_lang_status = &pop_cp_function_context; + mark_lang_status = &mark_cp_function_context; /* Create the global per-function variables. */ push_function_context_to (NULL_TREE); @@ -14597,12 +14598,11 @@ in_function_p () void -lang_mark_false_label_stack (arg) - void *arg; +lang_mark_false_label_stack (l) + struct label_node *l; { /* C++ doesn't use false_label_stack. It better be NULL. */ - if (*(void **)arg != NULL) - abort(); + my_friendly_assert (l != NULL, 19990904); } void diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 2aac32a..8e6ae60 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1917,7 +1917,6 @@ grok_function_init (decl, init) vtbl. For wellformed call, it should be itself. pr4737 */ if (!DESTRUCTOR_NAME_P (DECL_ASSEMBLER_NAME (decl))) { - extern tree abort_fndecl; /* Give this node rtl from `abort'. */ DECL_RTL (decl) = DECL_RTL (abort_fndecl); } |