MIPS: Don't infer IRIX OS ABI from generic section names

There are `.MIPS.abiflags', `.MIPS.options' and `.MIPS.stubs' sections
also present in Linux executables, so we can't infer IRIX OS ABI solely
from the existence of these sections.  This is not going to be a problem
as there are bound to be other sections whose names start with `.MIPS.'
in IRIX executables and this selection only matters for a non-default OS
ABI in a multiple-target GDB executable.  As a last resort the automatic
selection can be overridden with `set osabi'.

	* mips-irix-tdep.c (mips_irix_elf_osabi_sniff_abi_tag_sections):
	Exclude `.MIPS.abiflags', `.MIPS.options' and `.MIPS.stubs' from
	the list of sections determining GDB_OSABI_IRIX.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5ce1ec145345de4821808b36a69bc54102d09476..afb1f92152627bc9e82818a5fb1d8d691cc981b0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-09  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * mips-irix-tdep.c (mips_irix_elf_osabi_sniff_abi_tag_sections):
+       Exclude `.MIPS.abiflags', `.MIPS.options' and `.MIPS.stubs' from
+       the list of sections determining GDB_OSABI_IRIX.
+
 2014-09-09  James Hogan  <james.hogan@imgtec.com>
 
        * MAINTAINERS (Write After Approval): Add "James Hogan".

diff --git a/gdb/mips-irix-tdep.c b/gdb/mips-irix-tdep.c
index a017e3bbdf948aad639c3317bbbdbc95fe52a4a5..1232be87886aaaf34870514c3df1c2d4720627f1 100644 (file)
--- a/gdb/mips-irix-tdep.c
+++ b/gdb/mips-irix-tdep.c
@@ -38,12 +38,16 @@ mips_irix_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect,
   name = bfd_get_section_name (abfd, sect);
   sectsize = bfd_section_size (abfd, sect);
 
-  if (strncmp (name, ".MIPS.", 6) == 0 && sectsize > 0)
-    {
-      /* The presence of a section named with a ".MIPS." prefix is
-         indicative of an IRIX binary.  */
-      *os_ident_ptr = GDB_OSABI_IRIX;
-    }
+  /* The presence of a section named with a ".MIPS." prefix is usually
+     indicative of an IRIX binary, however there are exceptions that
+     are present universally, so check for those names and avoid
+     switching away from the default OS ABI in the case of a match.  */
+  if (strncmp (name, ".MIPS.", 6) == 0
+      && strcmp (name, ".MIPS.abiflags") != 0
+      && strcmp (name, ".MIPS.options") != 0
+      && strcmp (name, ".MIPS.stubs") != 0
+      && sectsize > 0)
+    *os_ident_ptr = GDB_OSABI_IRIX;
 }
 
 static enum gdb_osabi