* stbsread.c (read_one_struct_field): Use subfile language instead of

	global language. Improve efficiency.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c23bdaa27051bc81bc3c44319bd9bb8451c31c6..32062d3f9599b5945032c31f5a9ad193ca6c18b6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 13 13:33:58 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+       * stbsread.c (read_one_struct_field): Use subfile language instead of
+       global language. Improve efficiency.
+
 Wed Sep 13 08:45:02 1995  Jeff Law  (law@fast.cs.utah.edu)
 
        * somsolib.c (auto_solib_add_at_startup): Define new global variable.

diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index b71611275382d476cb6921421404d823d854e4d8..74e8bc1e253bc81859134f891dcc1a693fc1eb36 100644 (file)
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -2350,7 +2350,7 @@ read_one_struct_field (fip, pp, p, type, objfile)
      The stabs contains full mangled name for each field.
      We try to demangle the name and extract the field name out of it.
   */
-  if (current_language->la_language == language_cplus)
+  if (ARM_DEMANGLING && current_subfile->language == language_cplus)
     {
       char save_p;
       char *dem, *dem_p;