From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Tue, 21 Sep 1993 17:41:45 +0000 (+0000)
Subject: 	* symfile.c (deduce_language_from_filename): Accept .cxx for C++.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b05f64a705ca54f13007fb08912aef4ced6fc79;p=binutils-gdb.git

	* symfile.c (deduce_language_from_filename): Accept .cxx for C++.
	* buildsym.c (start_subfile): Use deduce_language_from_filename
	rather than checking for .C or .cc ourself.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf38587d955..5cfd6ea697f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 21 11:44:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* symfile.c (deduce_language_from_filename): Accept .cxx for C++.
+	* buildsym.c (start_subfile): Use deduce_language_from_filename
+	rather than checking for .C or .cc ourself.
+
 Mon Sep 20 14:53:11 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* defs.h: Declare argument of re_comp as const char *.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index e8804cb57b3..5a762af2bff 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -422,18 +422,15 @@ start_subfile (name, dirname)
      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.  */
+     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).  */
 
   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')))
+      if (deduce_language_from_filename (subfile->name) == language_cplus)
 	for (s = subfiles; s != NULL; s = s->next)
 	  if (s->language == language_c)
 	    s->language = language_cplus;