From 21af55c92d1da8777dd6b71b686f6672670bf3ba Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Sun, 12 Feb 1995 17:53:34 +0000 Subject: [PATCH] * buildsym.c (start_subfile): Set language for f2c like for cfront. --- gdb/ChangeLog | 8 ++++++++ gdb/buildsym.c | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fb03eae9d01..9ac6b299a41 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +Sun Feb 12 09:03:47 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + + * buildsym.c (start_subfile): Set language for f2c like for cfront. + +Thu Feb 9 20:20:11 1995 Rob Savoye + + * op50n-rom.c: Add the control registers. + Thu Feb 9 15:46:39 1995 Stan Shebs * Makefile.in (CLIBS): Add $(LIBIBERTY) before, in addition to diff --git a/gdb/buildsym.c b/gdb/buildsym.c index e4dcbddc568..fc033788447 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -439,23 +439,26 @@ start_subfile (name, dirname) of any pending subfiles from C to C++. We also accept any other C++ suffixes accepted by deduce_language_from_filename (in particular, some people use .cxx with cfront). */ + /* Likewise for f2c. */ if (subfile->name) { struct subfile *s; + enum language sublang = deduce_language_from_filename (subfile->name); - if (deduce_language_from_filename (subfile->name) == language_cplus) + if (sublang == language_cplus || sublang == language_fortran) for (s = subfiles; s != NULL; s = s->next) if (s->language == language_c) - s->language = language_cplus; + s->language = sublang; } /* And patch up this file if necessary. */ if (subfile->language == language_c && subfile->next != NULL - && subfile->next->language == language_cplus) + && (subfile->next->language == language_cplus + || subfile->next->language == language_fortran)) { - subfile->language = language_cplus; + subfile->language = subfile->next->language; } } -- 2.30.2