* Makefile.in (acconfig_h): Remove incorrect macro.

[deliverable/binutils-gdb.git] / gdb / elfread.c

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 9b0718e1d40af3a7241bfcd38da9c625a653b936..9ddf3d489b8f03535ae9ac485992d80677d06881 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -52,20 +52,6 @@ struct elfinfo
     asection *mdebugsect;      /* Section pointer for .mdebug section */
   };
 
-/* Various things we might complain about... */
-
-struct complaint section_info_complaint =
-{"elf/stab section information %s without a preceding file symbol", 0, 0};
-
-struct complaint section_info_dup_complaint =
-{"duplicated elf/stab section information for %s", 0, 0};
-
-struct complaint stab_info_mismatch_complaint =
-{"elf/stab section information missing for %s", 0, 0};
-
-struct complaint stab_info_questionable_complaint =
-{"elf/stab section information questionable for %s", 0, 0};
-
 static void free_elfinfo (void *);
 
 /* We are called once per section from elf_symfile_read.  We
@@ -357,12 +343,13 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
                           || ((sym->flags & BSF_LOCAL)
                               && sym->name[0] == '$'
                               && sym->name[1] == 'L'))
-                   /* Looks like a compiler-generated label.  Skip it.
-                      The assembler should be skipping these (to keep
-                      executables small), but apparently with gcc on the
-                      delta m88k SVR4, it loses.  So to have us check too
-                      should be harmless (but I encourage people to fix this
-                      in the assembler instead of adding checks here).  */
+                   /* Looks like a compiler-generated label.  Skip
+                      it.  The assembler should be skipping these (to
+                      keep executables small), but apparently with
+                      gcc on the (deleted) delta m88k SVR4, it loses.
+                      So to have us check too should be harmless (but
+                      I encourage people to fix this in the assembler
+                      instead of adding checks here).  */
                    continue;
                  else
                    {
@@ -414,8 +401,9 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
                                      sizeof (*sectinfo));
                              if (filesym == NULL)
                                {
-                                 complain (&section_info_complaint,
-                                           sym->name);
+                                 complaint (&symfile_complaints,
+                                            "elf/stab section information %s without a preceding file symbol",
+                                            sym->name);
                                }
                              else
                                {
@@ -427,8 +415,9 @@ elf_symtab_read (struct objfile *objfile, int dynamic)
                            { 
                              if (sectinfo->sections[index] != 0)
                                {
-                                 complain (&section_info_dup_complaint,
-                                           sectinfo->filename);
+                                 complaint (&symfile_complaints,
+                                            "duplicated elf/stab section information for %s",
+                                            sectinfo->filename);
                                }
                            }
                          else
@@ -739,7 +728,8 @@ elfstab_offset_sections (struct objfile *objfile, struct partial_symtab *pst)
 
   if (maybe == 0 && questionable != 0)
     {
-      complain (&stab_info_questionable_complaint, filename);
+      complaint (&symfile_complaints,
+                "elf/stab section information questionable for %s", filename);
       maybe = questionable;
     }
 
@@ -756,7 +746,8 @@ elfstab_offset_sections (struct objfile *objfile, struct partial_symtab *pst)
 
   /* We were unable to find any offsets for this file.  Complain.  */
   if (dbx->stab_section_info)  /* If there *is* any info, */
-    complain (&stab_info_mismatch_complaint, filename);
+    complaint (&symfile_complaints,
+              "elf/stab section information missing for %s", filename);
 }
 \f
 /* Register that we are able to handle ELF object file formats.  */