Detect NaCl osabi from objfile

gdb/nacl-tdep.c

 /* Target-dependent code for NaCl.
 
    Copyright (C) 2001, 2003-2012 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 3 of the License, or
    (at your option) any later version.
@@ skipping 12 matching lines @@
 #include "linux-tdep.h"
 #include "amd64-tdep.h"
 #include "nacl-manifest.h"
 #include "symtab.h"
 #include "solib-svr4.h"
 #include "frame.h"
 #include "osabi.h"
 #include "disasm.h"
 #include "breakpoint.h"
 #include "target.h"
+#include "elf-bfd.h"
+
+static enum gdb_osabi
+nacl_osabi_sniffer (bfd *abfd)
+{
+  /* WARNING! This way of checking for NaCl OS ABI is deprecated.
+     See http://code.google.com/p/nativeclient/issues/detail?id=2971  */
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour &&
+      elf_elfheader (abfd)->e_ident[EI_OSABI] == 123)
+    return GDB_OSABI_NACL;
+
+  return GDB_OSABI_UNKNOWN;
+}
 
 static void
 nacl_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   /* NaCl uses SVR4-style shared libraries.  */
   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
   set_solib_svr4_map_so_name (gdbarch, nacl_manifest_find);
   set_gdbarch_process_record (gdbarch, i386_process_record);
 }
 
@@ skipping 103 matching lines @@
       return 1;
     }
 
   return 0;
 }
 
 static void
 amd64_nacl_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
   linux_init_abi (info, gdbarch);
   amd64_init_abi (info, gdbarch);
   tdep->tdesc = tdesc_amd64_linux;
   set_solib_svr4_fetch_link_map_offsets (gdbarch,
                                          amd64_nacl_fetch_link_map_offsets);
   nacl_init_abi (info, gdbarch);
 
   /* NaCl data model.
 
      WARNING! This might confuse a lot of code, as it uses
@@ skipping 20 matching lines @@
                                          amd64_nacl_adjust_breakpoint_address);
   set_gdbarch_software_single_step (gdbarch, amd64_nacl_software_single_step);
 }
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */
 extern void _initialize_nacl_tdep (void);
 
 void
 _initialize_nacl_tdep (void)
 {
+  gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour,
+                                  nacl_osabi_sniffer);
+
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
                           GDB_OSABI_NACL, amd64_nacl_init_abi);
 
   gdbarch_register_osabi (bfd_arch_i386, 0,
                           GDB_OSABI_NACL, i386_nacl_init_abi);
 }