2009-12-02 Tristan Gingold <gingold@adacore.com>

	* dwarf2read.c (dwarf2_build_psymtabs_easy): Remove mainline parameter.
	(dwarf2_build_psymtabs_hard): Ditto.
	(dwarf2_build_psymtabs): Ajust calls.
	* stabsread.h (elfstab_build_psymtabs): Remove mainline parameter on
	the prototype.
	(coffstab_build_psymtabs): Ditto.
	(stabsect_build_psymtabs): Ditto.
	* dbxread.c (coffstab_build_psymtabs): Remove mainline parameter on
	the definition.
	(elfstab_build_psymtabs): Ditto.
	(stabsect_build_psymtabs): Ditto.
	* coffread.c (coff_symfile_read): Adjust call.
	* elfread.c (elf_symfile_read): Ditto.
	* somread.c (som_symfile_read): Ditto.

7 files changed, 30 insertions, 25 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8f6b529e88..a90c40aa499 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,21 @@
-2009-12-01  Tristan Gingold  <gingold@adacore.com>
+2009-12-02  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf2read.c (dwarf2_build_psymtabs_easy): Remove mainline parameter.
+	(dwarf2_build_psymtabs_hard): Ditto.
+	(dwarf2_build_psymtabs): Ajust calls.
+	* stabsread.h (elfstab_build_psymtabs): Remove mainline parameter on
+	the prototype.
+	(coffstab_build_psymtabs): Ditto.
+	(stabsect_build_psymtabs): Ditto.
+	* dbxread.c (coffstab_build_psymtabs): Remove mainline parameter on
+	the definition.
+	(elfstab_build_psymtabs): Ditto.
+	(stabsect_build_psymtabs): Ditto.
+	* coffread.c (coff_symfile_read): Adjust call.
+	* elfread.c (elf_symfile_read): Ditto.
+	* somread.c (som_symfile_read): Ditto.
+
+2009-12-02  Tristan Gingold  <gingold@adacore.com>
 
 	* charset.c (_initialize_charset): Set a default value to
 	auto_host_charset_name if empty.
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 98c563a3d37..d66312b8b07 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -634,7 +634,6 @@ coff_symfile_read (struct objfile *objfile, int mainline)
       stabstrsize = bfd_section_size (abfd, info->stabstrsect);
 
       coffstab_build_psymtabs (objfile,
-			       mainline,
 			       info->textaddr, info->textsize,
 			       info->stabsects,
 			       info->stabstrsect->filepos, stabstrsize);
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 6d4c893f167..771483a85bf 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -3320,8 +3320,6 @@ no enclosing block"));
    OBJFILE is the object file we are reading symbols from.
    ADDR is the address relative to which the symbols are (e.g.
    the base address of the text segment).
-   MAINLINE is true if we are reading the main symbol
-   table (as opposed to a shared lib or dynamically loaded file).
    TEXTADDR is the address of the text section.
    TEXTSIZE is the size of the text section.
    STABSECTS is the list of .stab sections in OBJFILE.
@@ -3332,7 +3330,7 @@ no enclosing block"));
    adjusted for coff details. */
 
 void
-coffstab_build_psymtabs (struct objfile *objfile, int mainline,
+coffstab_build_psymtabs (struct objfile *objfile,
 			 CORE_ADDR textaddr, unsigned int textsize,
 			 struct stab_section_list *stabsects,
 			 file_ptr stabstroffset, unsigned int stabstrsize)
@@ -3415,8 +3413,6 @@ coffstab_build_psymtabs (struct objfile *objfile, int mainline,
    OBJFILE is the object file we are reading symbols from.
    ADDR is the address relative to which the symbols are (e.g.
    the base address of the text segment).
-   MAINLINE is true if we are reading the main symbol
-   table (as opposed to a shared lib or dynamically loaded file).
    STABSECT is the BFD section information for the .stab section.
    STABSTROFFSET and STABSTRSIZE define the location in OBJFILE where the
    .stabstr section exists.
@@ -3425,8 +3421,7 @@ coffstab_build_psymtabs (struct objfile *objfile, int mainline,
    adjusted for elf details. */
 
 void
-elfstab_build_psymtabs (struct objfile *objfile, int mainline,
-			asection *stabsect,
+elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect,
 			file_ptr stabstroffset, unsigned int stabstrsize)
 {
   int val;
@@ -3501,15 +3496,13 @@ elfstab_build_psymtabs (struct objfile *objfile, int mainline,
    OBJFILE is the object file we are reading symbols from.
    ADDR is the address relative to which the symbols are (e.g. the base address
    of the text segment).
-   MAINLINE is true if we are reading the main symbol table (as opposed to a
-   shared lib or dynamically loaded file).
    STAB_NAME is the name of the section that contains the stabs.
    STABSTR_NAME is the name of the section that contains the stab strings.
 
    This routine is mostly copied from dbx_symfile_init and dbx_symfile_read. */
 
 void
-stabsect_build_psymtabs (struct objfile *objfile, int mainline, char *stab_name,
+stabsect_build_psymtabs (struct objfile *objfile, char *stab_name,
 			 char *stabstr_name, char *text_name)
 {
   int val;
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 906bbfc15fd..0fa63a5c42a 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -769,7 +769,7 @@ dwarf2_invalid_attrib_class_complaint (const char *arg1, const char *arg2)
 static void dwarf2_locate_sections (bfd *, asection *, void *);
 
 #if 0
-static void dwarf2_build_psymtabs_easy (struct objfile *, int);
+static void dwarf2_build_psymtabs_easy (struct objfile *);
 #endif
 
 static void dwarf2_create_include_psymtab (char *, struct partial_symtab *,
@@ -779,7 +779,7 @@ static void dwarf2_build_include_psymtabs (struct dwarf2_cu *,
                                            struct die_info *,
                                            struct partial_symtab *);
 
-static void dwarf2_build_psymtabs_hard (struct objfile *, int);
+static void dwarf2_build_psymtabs_hard (struct objfile *);
 
 static void scan_partial_symbols (struct partial_die_info *,
 				  CORE_ADDR *, CORE_ADDR *,
@@ -1474,14 +1474,14 @@ dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
       /* Things are significantly easier if we have .debug_aranges and
          .debug_pubnames sections */
 
-      dwarf2_build_psymtabs_easy (objfile, mainline);
+      dwarf2_build_psymtabs_easy (objfile);
     }
   else
 #endif
     /* only test this case for now */
     {
       /* In this case we have to work a bit harder */
-      dwarf2_build_psymtabs_hard (objfile, mainline);
+      dwarf2_build_psymtabs_hard (objfile);
     }
 }
 
@@ -1490,7 +1490,7 @@ dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
    .debug_pubnames and .debug_aranges sections.  */
 
 static void
-dwarf2_build_psymtabs_easy (struct objfile *objfile, int mainline)
+dwarf2_build_psymtabs_easy (struct objfile *objfile)
 {
   bfd *abfd = objfile->obfd;
   char *aranges_buffer, *pubnames_buffer;
@@ -2075,7 +2075,7 @@ build_type_psymtabs (struct objfile *objfile)
    .debug_info and .debug_abbrev sections.  */
 
 static void
-dwarf2_build_psymtabs_hard (struct objfile *objfile, int mainline)
+dwarf2_build_psymtabs_hard (struct objfile *objfile)
 {
   /* Instead of reading this into a big buffer, we should probably use
      mmap()  on architectures that support it. (FIXME) */
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 08852400591..b9e156858b3 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -736,7 +736,6 @@ elf_symfile_read (struct objfile *objfile, int mainline)
       /* FIXME should probably warn about a stab section without a stabstr.  */
       if (str_sect)
 	elfstab_build_psymtabs (objfile,
-				mainline,
 				ei.stabsect,
 				str_sect->filepos,
 				bfd_section_size (abfd, str_sect));
diff --git a/gdb/somread.c b/gdb/somread.c
index 36a2b28d428..d519d2c5cc2 100644
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -340,7 +340,7 @@ som_symfile_read (struct objfile *objfile, int mainline)
 
   /* Now read information from the stabs debug sections.
      This is emitted by gcc.  */
-  stabsect_build_psymtabs (objfile, mainline,
+  stabsect_build_psymtabs (objfile,
 			   "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$");
 }
 
diff --git a/gdb/stabsread.h b/gdb/stabsread.h
index 83458d1e13a..19cc8639c81 100644
--- a/gdb/stabsread.h
+++ b/gdb/stabsread.h
@@ -175,21 +175,18 @@ extern void process_one_symbol (int, int, CORE_ADDR, char *,
 				struct section_offsets *, struct objfile *);
 
 extern void elfstab_build_psymtabs (struct objfile *objfile,
-				    int mainline,
 				    asection *stabsect,
 				    file_ptr stabstroffset,
 				    unsigned int stabstrsize);
 
 extern void coffstab_build_psymtabs
   (struct objfile *objfile,
-   int mainline,
    CORE_ADDR textaddr, unsigned int textsize,
    struct stab_section_list *stabs,
    file_ptr stabstroffset, unsigned int stabstrsize);
 
-extern void stabsect_build_psymtabs
-  (struct objfile *objfile,
-   int mainline, char *stab_name, char *stabstr_name, char *text_name);
+extern void stabsect_build_psymtabs (struct objfile *objfile, char *stab_name,
+				     char *stabstr_name, char *text_name);
 
 extern void elfstab_offset_sections (struct objfile *,
 				     struct partial_symtab *);