*** empty log message ***

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

diff --git a/gdb/osabi.c b/gdb/osabi.c
index 5d3962ae7522b71dee8127aa46e0320c51a02ba5..8b47be6b04211270a30da981b3e20396e2d59ff0 100644 (file)
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -1,23 +1,21 @@
 /* OS ABI variant handling for GDB.
 
-   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,  
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-  
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 
@@ -64,9 +62,7 @@ static const char * const gdb_osabi_names[] =
   "OpenBSD ELF",
   "Windows CE",
   "DJGPP",
-  "NetWare",
   "Irix",
-  "LynxOS",
   "Interix",
   "HP/UX ELF",
   "HP/UX SOM",
@@ -74,6 +70,7 @@ static const char * const gdb_osabi_names[] =
   "QNX Neutrino",
 
   "Cygwin",
+  "AIX",
 
   "<invalid>"
 };
@@ -206,14 +203,9 @@ gdbarch_lookup_osabi (bfd *abfd)
     return user_selected_osabi;
 
   /* If we don't have a binary, return the default OS ABI (if set) or
-     an inconclusive result (otherwise).  */
+     unknown (otherwise).  */
   if (abfd == NULL) 
-    {
-      if (GDB_OSABI_DEFAULT != GDB_OSABI_UNKNOWN)
-       return GDB_OSABI_DEFAULT;
-      else
-       return GDB_OSABI_UNINITIALIZED;
-    }
+    return GDB_OSABI_DEFAULT;
 
   match = GDB_OSABI_UNKNOWN;
   match_specific = 0;
@@ -547,7 +539,7 @@ generic_elf_osabi_sniffer (bfd *abfd)
          "FreeBSD" in the padding of the e_ident field of the ELF
          header to "brand" their ELF binaries in FreeBSD 3.x.  */
       if (memcmp (&elf_elfheader (abfd)->e_ident[8],
-                 "FreeBSD", sizeof ("FreeBSD") == 0)
+                 "FreeBSD", sizeof ("FreeBSD")) == 0)
        osabi = GDB_OSABI_FREEBSD_ELF;
     }