From 6e46637421cc7318c3a1333e32725eaca5f7af4c Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 9 Sep 2014 23:41:28 +0100 Subject: [PATCH] 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. --- gdb/ChangeLog | 6 ++++++ gdb/mips-irix-tdep.c | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5ce1ec1453..afb1f92152 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-09-09 Maciej W. Rozycki + + * 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 * MAINTAINERS (Write After Approval): Add "James Hogan". diff --git a/gdb/mips-irix-tdep.c b/gdb/mips-irix-tdep.c index a017e3bbdf..1232be8788 100644 --- 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