From 56ad756a85fdd60a23a88e5232904942d2c6aa38 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Wed, 28 Jul 1993 00:22:08 +0000 Subject: [PATCH] * buildsym.c (start_subfile): If a .c file includes a .C file, set the language of both of them to C++. --- gdb/ChangeLog | 3 +++ gdb/buildsym.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b2fd729a5e..27eeac7d33 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ Tue Jul 27 12:07:38 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + * buildsym.c (start_subfile): If a .c file includes a .C file, set + the language of both of them to C++. + * config/sparc/xm-sun4os4.h: Define MEM_FNS_DECLARED and include . Include rather than declaring malloc functions ourself. diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 6c8c807062..ba593ca0b3 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -412,6 +412,37 @@ start_subfile (name, dirname) { subfile->language = subfile->next->language; } + + /* cfront output is a C program, so in most ways it looks like a C + program. But to demangle we need to set the language to C++. We + can distinguish cfront code by the fact that it has #line + directives which specify a file name ending in .C. + + So if the filename of this subfile ends in .C, then change the language + of any pending subfiles from C to C++. .cc is also accepted, even + though I don't think cfront allows it. */ + + if (subfile->name) + { + char *p; + struct subfile *s; + + p = strrchr (subfile->name, '.'); + if (p != NULL + && (p[1] == 'C' && p[2] == '\0' + || p[1] == 'c' && p[2] == 'c' && p[3] == '\0')) + for (s = subfiles; s != NULL; s = s->next) + if (s->language == language_c) + s->language = language_cplus; + } + + /* And patch up this file if necessary. */ + if (subfile->language == language_c + && subfile->next != NULL + && subfile->next->language == language_cplus) + { + subfile->language = language_cplus; + } } /* For stabs readers, the first N_SO symbol is assumed to be the source -- 2.34.1